changeset 13604:c684649ef702

Merge
author kvn
date Thu, 24 Aug 2017 23:54:53 +0000
parents b94f3a90edeb dd079e888b11
children 316854ef2fa2
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/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/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/test/compiler/aot/AotCompiler.java	Thu Aug 24 22:37:27 2017 +0000
+++ b/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);
     }