--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 12 12:06:22 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 12 14:13:15 2018 -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);
}