--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	2018-07-07 20:00:21.625001000 -0700
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	2018-07-07 20:00:21.485001000 -0700
@@ -125,7 +125,6 @@
             : options.isSet(G_CUSTOM, "vars");
         genCrt = options.isSet(XJCOV);
         debugCode = options.isSet("debug.code");
-        allowBetterNullChecks = target.hasObjects();
         disableVirtualizedPrivateInvoke = options.isSet("disableVirtualizedPrivateInvoke");
         pool = new Pool(types);
 
@@ -140,7 +139,6 @@
     private final boolean varDebugInfo;
     private final boolean genCrt;
     private final boolean debugCode;
-    private final boolean allowBetterNullChecks;
     private boolean disableVirtualizedPrivateInvoke;
 
     /** Code buffer, set by genMethod.
@@ -1919,13 +1917,8 @@
     /** Generate a null check from the object value at stack top. */
     private void genNullCheck(JCTree tree) {
         code.statBegin(tree.pos);
-        if (allowBetterNullChecks) {
-            callMethod(tree.pos(), syms.objectsType, names.requireNonNull,
-                    List.of(syms.objectType), true);
-        } else {
-            callMethod(tree.pos(), syms.objectType, names.getClass,
-                    List.nil(), false);
-        }
+	callMethod(tree.pos(), syms.objectsType, names.requireNonNull,
+		   List.of(syms.objectType), true);
         code.emitop0(pop);
     }