Merge
authorkvn
Thu, 24 Aug 2017 23:54:53 +0000
changeset 46982 2e6921bc9f8e
parent 46979 054736045ae7 (current diff)
parent 46981 add50afae9e1 (diff)
child 46983 1c9cefa2a443
Merge
--- a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java	Thu Aug 24 22:37:27 2017 +0000
+++ b/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffSection.java	Thu Aug 24 23:54:53 2017 +0000
@@ -50,7 +50,7 @@
         byte[] Name = sectName.getBytes();
         int max = Name.length <= IMAGE_SECTION_HEADER.Name.sz ? Name.length : IMAGE_SECTION_HEADER.Name.sz;
 
-        assert (sectAlign < 1 || sectAlign > 1024 || (sectAlign & (sectAlign - 1)) != 0) : "section alignment is not valid: " + sectAlign;
+        assert !(sectAlign < 1 || sectAlign > 1024 || (sectAlign & (sectAlign - 1)) != 0) : "section alignment is not valid: " + sectAlign;
         align = sectAlign;
 
         // Using 32 because IMAGE_SCN_ALIGN_*BYTES is value + 1
--- a/hotspot/test/compiler/aot/AotCompiler.java	Thu Aug 24 22:37:27 2017 +0000
+++ b/hotspot/test/compiler/aot/AotCompiler.java	Thu Aug 24 23:54:53 2017 +0000
@@ -113,6 +113,9 @@
             args.add("--linker-path");
             args.add(linker);
         }
+        // Execute with asserts
+        args.add("-J-ea");
+        args.add("-J-esa");
         return launchJaotc(args, extraopts);
     }