[NTI] Convert j2clcheckspass to use TypeI.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=134724323
google · Sep 30, 2016 · b0a803c · b0a803c
1 parent 958f814
commit b0a803c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java
@@ -489,23 +489,23 @@ protected List<PassFactory> getChecks() {
       checks.add(computeFunctionNames);
     }
 
+    if (options.j2clPassMode.shouldAddJ2clPasses()) {
+      checks.add(j2clChecksPass);
+    }
+
     // NOTE(dimvar): Tried to move this into the optimizations, but had to back off
     // because the very first pass, normalization, rewrites the code in a way that
     // causes loss of type information.
     // So, I will convert the remaining optimizations to use TypeI and test that only
     // in unit tests, not full builds. Once all passes are converted, then
     // drop the OTI-after-NTI altogether.
     // In addition, I will probably have a local edit of the repo that retains both
-    // types on Nodes, so I can test full builds on my machine. We can't check such
+    // types on Nodes, so I can test full builds on my machine. We can't check in such
-    // a change in because it would greatly increase memory usage.
+    // a change because it would greatly increase memory usage.
     if (options.getNewTypeInference()) {
       addOldTypeCheckerPasses(checks, options);
     }
 
-    if (options.j2clPassMode.shouldAddJ2clPasses()) {
-      checks.add(j2clChecksPass);
-    }
-
     checks.add(createEmptyPass("afterStandardChecks"));
 
     assertAllOneTimePasses(checks);

diff --git a/src/com/google/javascript/jscomp/J2clChecksPass.java b/src/com/google/javascript/jscomp/J2clChecksPass.java
@@ -17,10 +17,10 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
+import com.google.javascript.rhino.FunctionTypeI;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
-import com.google.javascript.rhino.jstype.FunctionType;
+import com.google.javascript.rhino.TypeI;
-import com.google.javascript.rhino.jstype.JSType;
 import java.util.Map;
 
 /**
@@ -61,8 +61,8 @@ private void checkReferenceEquality(
         || n.getToken() == Token.EQ
         || n.getToken() == Token.SHNE
         || n.getToken() == Token.NE) {
-      JSType firstJsType = n.getFirstChild().getJSType();
+      TypeI firstJsType = n.getFirstChild().getTypeI();
-      JSType lastJsType = n.getLastChild().getJSType();
+      TypeI lastJsType = n.getLastChild().getTypeI();
       boolean hasType = isType(firstJsType, fileName) || isType(lastJsType, fileName);
       boolean hasNullType = isNullType(firstJsType) || isNullType(lastJsType);
       if (hasType && !hasNullType) {
@@ -71,14 +71,14 @@ private void checkReferenceEquality(
     }
   }
 
-  private boolean isNullType(JSType jsType) {
+  private boolean isNullType(TypeI jsType) {
     if (jsType == null) {
       return false;
     }
     return jsType.isNullType() || jsType.isVoidType();
   }
 
-  private boolean isType(JSType jsType, String fileName) {
+  private boolean isType(TypeI jsType, String fileName) {
     if (jsType == null) {
       return false;
     }
@@ -90,8 +90,8 @@ private boolean isType(JSType jsType, String fileName) {
     return sourceName != null && sourceName.endsWith(fileName);
   }
 
-  private String getSourceName(JSType jsType) {
+  private String getSourceName(TypeI jsType) {
-    FunctionType constructor = jsType.toMaybeObjectType().getConstructor();
+    FunctionTypeI constructor = jsType.toMaybeObjectType().getConstructor();
     if (constructor == null) {
       return "";
     }

diff --git a/src/com/google/javascript/jscomp/newtypes/JSType.java b/src/com/google/javascript/jscomp/newtypes/JSType.java
@@ -1586,6 +1586,16 @@ public boolean isVoidable() {
     return !isTop() && (getMask() & UNDEFINED_MASK) != 0;
   }
 
+  @Override
+  public boolean isNullType() {
+    return equals(this.commonTypes.NULL);
+  }
+
+  @Override
+  public boolean isVoidType() {
+    return equals(this.commonTypes.UNDEFINED);
+  }
+
   @Override
   public TypeI restrictByNotNullOrUndefined() {
     return this.removeType(this.commonTypes.NULL_OR_UNDEFINED);

diff --git a/src/com/google/javascript/rhino/TypeI.java b/src/com/google/javascript/rhino/TypeI.java
@@ -82,6 +82,10 @@ public interface TypeI {
 
   boolean isVoidable();
 
+  boolean isNullType();
+
+  boolean isVoidType();
+
   boolean isPrototypeObject();
 
   boolean isInstanceofObject();

diff --git a/src/com/google/javascript/rhino/jstype/JSType.java b/src/com/google/javascript/rhino/jstype/JSType.java
@@ -249,10 +249,12 @@ public boolean isDateType() {
     return false;
   }
 
+  @Override
   public boolean isNullType() {
     return false;
   }
 
+  @Override
   public boolean isVoidType() {
     return false;
   }

diff --git a/test/com/google/javascript/jscomp/J2clCheckPassTest.java b/test/com/google/javascript/jscomp/J2clCheckPassTest.java
@@ -18,9 +18,10 @@
 import static com.google.javascript.jscomp.J2clChecksPass.J2CL_REFERENCE_EQUALITY;
 import static com.google.javascript.jscomp.J2clChecksPass.REFERENCE_EQUALITY_TYPE_PATTERNS;
 
-public class J2clCheckPassTest extends CompilerTestCase {
+public class J2clCheckPassTest extends TypeICompilerTestCase {
 
   public J2clCheckPassTest() {
+    super(DEFAULT_EXTERNS);
     enableTypeCheck();
   }