RFR: [jdk7u] 8028471: PPC64 (part 215): opto: Extend ImplicitNullCheck optimization.

[Florian Bruckner (3kraft)]

Hi,

this improves things, but the build now breaks in NetworkInterface.c:

../../../src/solaris/native/java/net/NetworkInterface.c: In function 'getIndex':
../../../src/solaris/native/java/net/NetworkInterface.c:1299: error: 'SIOCGIFINDEX' undeclared 
(first use in this function)
../../../src/solaris/native/java/net/NetworkInterface.c:1299: error: (Each undeclared identifier is 
reported only once
../../../src/solaris/native/java/net/NetworkInterface.c:1299: error: for each function it appears in.)
../../../src/solaris/native/java/net/NetworkInterface.c:1303: error: 'struct ifreq' has no member 
named 'ifr_ifindex'
../../../src/solaris/native/java/net/NetworkInterface.c: In function 'getMacAddress':
../../../src/solaris/native/java/net/NetworkInterface.c:1432: warning: no return statement in 
function returning non-void
../../../src/solaris/native/java/net/NetworkInterface.c: At top level:
../../../src/solaris/native/java/net/NetworkInterface.c:1866: error: redefinition of 
'openSocketWithFallback'
../../../src/solaris/native/java/net/NetworkInterface.c:1049: error: previous definition of 
'openSocketWithFallback' was here
../../../src/solaris/native/java/net/NetworkInterface.c:1895: error: redefinition of 
'enumIPv4Interfaces'
../../../src/solaris/native/java/net/NetworkInterface.c:1078: error: previous definition of 
'enumIPv4Interfaces' was here
../../../src/solaris/native/java/net/NetworkInterface.c:1288: error: previous definition of 
'getIndex' was here
../../../src/solaris/native/java/net/NetworkInterface.c:2048: error: redefinition of 'getBroadcast'
../../../src/solaris/native/java/net/NetworkInterface.c:1311: error: previous definition of 
'getBroadcast' was here
../../../src/solaris/native/java/net/NetworkInterface.c:2079: error: redefinition of 'getSubnet'
../../../src/solaris/native/java/net/NetworkInterface.c:1342: error: previous definition of 
'getSubnet' was here
../../../src/solaris/native/java/net/NetworkInterface.c:2107: error: redefinition of 'getMacAddress'
../../../src/solaris/native/java/net/NetworkInterface.c:1370: error: previous definition of 
'getMacAddress' was here
../../../src/solaris/native/java/net/NetworkInterface.c:2134: error: redefinition of 'getMTU'
../../../src/solaris/native/java/net/NetworkInterface.c:1434: error: previous definition of 'getMTU' 
was here
../../../src/solaris/native/java/net/NetworkInterface.c:2148: error: redefinition of 'getFlags'
../../../src/solaris/native/java/net/NetworkInterface.c:1453: error: previous definition of 
'getFlags' was here

It seems the problem is due to this change:


-/** Linux **/
-#ifdef __linux__
+/** Linux, AIX **/
+#if !defined(__solaris__)


This problem goes away with this:

--- a/src/solaris/native/java/net/NetworkInterface.c    Thu Sep 22 03:03:31 2016 -0700
+++ b/src/solaris/native/java/net/NetworkInterface.c    Thu Feb 16 11:17:26 2017 +0100
@@ -1039,7 +1039,7 @@


  /** Linux, AIX **/
-#if !defined(__solaris__)
+#if !defined(__solaris__) && !defined(_ALLBSD_SOURCE)
  /* Open socket for further ioct calls, try v4 socket first and
   * if it falls return v6 socket
   */

Not sure though if this causes other problems of any sort, but at least it resolves the compiler 
problem.

With this patch I now get this build error:

make[4]: *** No rule to make target 
`/Users/florian/openjdk/sources/openjdk7/build/macosx-x86_64/classes/sun/lwawt/macosx/EventDispatchAccess.class', 
needed by 
`/Users/florian/openjdk/sources/openjdk7/build/macosx-x86_64/tmp/sun/sun.lwawt/lwawt/.classes.list'. 
Stop.

I have to say that I am a bit lost here, not being familiar with the build system.

regards,

Florian


On 16/02/2017 08:54, Lindenmaier, Goetz wrote:
>
> Hi
>
> I would like to downport 8028471 from jdk8 to jdk7.
>
> Major parts of this change came with bulk checkin
>
> „8165807 <https://bugs.openjdk.java.net/browse/JDK-8165807>: PPC64: Backport PPC64 port to OpenJDK 7”
> This contains some edits we did during review of 8028471 when
> we moved the change from aix 7 to main 9 repos. It also contains
> the parts missing in os_bsd.hpp.  The edits in lcm should
> only affect AIX.
>
> http://cr.openjdk.java.net/~goetz/wr17/8028471-macErr/webrev.01/ 
> <http://cr.openjdk.java.net/%7Egoetz/wr17/8028471-macErr/webrev.01/>
>
> Florian, could you please verify this on bsd?
>
> Best regards,
>
>   Goetz.
>