--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/TransValues.java	2019-04-24 13:36:56.000000000 -0700
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/TransValues.java	2019-04-24 13:36:56.000000000 -0700
@@ -121,6 +121,7 @@
         names = Names.instance(context);
         Options options = Options.instance(context);
         staticInitValueFactory = options.isSet("staticInitValueFactory");
+        staticInitValueFactory |= !options.isSet("noStaticInitValueFactory");
     }
 
     @SuppressWarnings("unchecked")
@@ -517,4 +518,4 @@
                 dctorType,
                 klass);
     }
-}
\ No newline at end of file
+}