--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java 2017-08-03 22:42:39.857940561 -0700 +++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugConfigImpl.java 2017-08-03 22:42:39.757936078 -0700 @@ -65,7 +65,7 @@ DebugOptions.TrackMemUse.getValue(options), DebugOptions.Time.getValue(options), DebugOptions.Dump.getValue(options), - DebugOptions.Verify.getValue(options), + getVerifyOptionValue(options), DebugOptions.MethodFilter.getValue(options), output, dumpHandlers, verifyHandlers); } @@ -99,6 +99,10 @@ this.output = output; } + private static String getVerifyOptionValue(OptionValues values) { + return !DebugOptions.Verify.hasBeenSet(values) && Assertions.assertionsEnabled() ? "" : DebugOptions.Verify.getValue(values); + } + @Override public OptionValues getOptions() { return options;