commit 8435e030ae16f62cca0b70f8618fbd4b2556b14e
author Goktug Gokdogan <goktug@google.com> Thu Aug 24 11:20:19 2017 -0700
committer Goktug Gokdogan <goktug@google.com> Thu Aug 24 11:20:19 2017 -0700
tree 829b49af70ced5ffe01eec3806f3656e4769167f
parent 88a028f6b74ecc529a4b878301448d057d2c6e89

Simplify InternalPreconditions.

Earlier the chaining of the variables required too many passes to optimize
and propogate constants. The patch reduces inter-depdency so constants
are resolved much quicker.

Change-Id: Ib4a9719b240b42eaa387862bdda91e0b9f862cfb

user/super/com/google/gwt/emul/javaemul/internal/InternalPreconditions.java

diff --git a/user/super/com/google/gwt/emul/javaemul/internal/InternalPreconditions.java b/user/super/com/google/gwt/emul/javaemul/internal/InternalPreconditions.java
index 65b498f..6e3f66f 100644
--- a/user/super/com/google/gwt/emul/javaemul/internal/InternalPreconditions.java
+++ b/user/super/com/google/gwt/emul/javaemul/internal/InternalPreconditions.java
@@ -83,10 +83,13 @@
       getProperty("jre.checks.checkLevel") == "NORMAL";
   // NORMAL or OPTIMIZED
   private static final boolean LEVEL_OPT_OR_HIGHER =
-      getProperty("jre.checks.checkLevel") == "OPTIMIZED" || LEVEL_NORMAL_OR_HIGHER;
+      getProperty("jre.checks.checkLevel") == "OPTIMIZED"
+          || getProperty("jre.checks.checkLevel") == "NORMAL";
   // NORMAL or OPTIMIZED or MINIMAL
   private static final boolean LEVEL_MINIMAL_OR_HIGHER =
-      getProperty("jre.checks.checkLevel") == "MINIMAL" || LEVEL_OPT_OR_HIGHER;
+      getProperty("jre.checks.checkLevel") == "MINIMAL"
+          || getProperty("jre.checks.checkLevel") == "OPTIMIZED"
+          || getProperty("jre.checks.checkLevel") == "NORMAL";
 
   static {
     if (!LEVEL_MINIMAL_OR_HIGHER) {