Rollback of "Fix bug in DisambiguateProperties involving generic inte…

…rfac..." There are some remaining issues that need to be fixed before this can be rolled forward. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=128065971
google · Jul 21, 2016 · 8759434 · 8759434
1 parent 2e8835f
commit 8759434
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 92 deletions.
diff --git a/src/com/google/javascript/rhino/jstype/PropertyMap.java b/src/com/google/javascript/rhino/jstype/PropertyMap.java
@@ -44,11 +44,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.io.Serializable;
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.IdentityHashMap;
+
+import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
@@ -165,29 +163,16 @@ Set<String> getOwnPropertyNames() {
   }
 
   void collectPropertyNames(Set<String> props) {
-    Set<PropertyMap> identitySet = Sets.newIdentityHashSet();
-    collectPropertyNamesHelper(props, identitySet);
-  }
-
-  // The interface inheritance chain can have cycles.
-  // Use cache to avoid stack overflow.
-  private void collectPropertyNamesHelper(
-      Set<String> props, Set<PropertyMap> cache) {
-    if (cache.contains(this)) {
-      return;
-    }
-    cache.add(this);
     props.addAll(properties.keySet());
     PropertyMap primaryParent = getPrimaryParent();
     if (primaryParent != null) {
-      primaryParent.collectPropertyNamesHelper(props, cache);
+      primaryParent.collectPropertyNames(props);
     }
     for (PropertyMap p : getSecondaryParents()) {
       if (p != null) {
-        p.collectPropertyNamesHelper(props, cache);
+        p.collectPropertyNames(props);
       }
     }
-    cache.remove(this);
   }
 
   boolean removeProperty(String name) {

diff --git a/src/com/google/javascript/rhino/jstype/ProxyObjectType.java b/src/com/google/javascript/rhino/jstype/ProxyObjectType.java
@@ -44,6 +44,7 @@
 import com.google.javascript.rhino.ErrorReporter;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
+
 import java.util.Collections;
 
 /**
@@ -258,13 +259,6 @@ public Iterable<ObjectType> getCtorImplementedInterfaces() {
         referencedObjType.getCtorImplementedInterfaces();
   }
 
-  @Override
-  public Iterable<ObjectType> getCtorExtendedInterfaces() {
-    return this.referencedObjType == null
-        ? Collections.<ObjectType>emptyList()
-            : this.referencedObjType.getCtorExtendedInterfaces();
-  }
-
   @Override
   public int hashCode() {
     return referencedType.hashCode();

diff --git a/test/com/google/javascript/jscomp/DisambiguatePropertiesTest.java b/test/com/google/javascript/jscomp/DisambiguatePropertiesTest.java
@@ -23,6 +23,7 @@
 import com.google.javascript.rhino.jstype.JSTypeRegistry;
 import com.google.javascript.rhino.testing.BaseJSTypeTestCase;
 import com.google.javascript.rhino.testing.TestErrorReporter;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -1829,70 +1830,6 @@ public void testStructuralInterfacesInExterns() {
     testSets(externs, js, js, "{}");
   }
 
-  public void testPropInParentInterface1() {
-    String js = LINE_JOINER.join(
-        "/** @interface */",
-        "function MyIterable() {}",
-        "MyIterable.prototype.iterator = function() {};",
-        "/**",
-        " * @interface",
-        " * @extends {MyIterable}",
-        " * @template T",
-        " */",
-        "function MyCollection() {}",
-        "/**",
-        " * @constructor",
-        " * @implements {MyCollection<?>}",
-        " */",
-        "function MyAbstractCollection() {}",
-        "/** @override */",
-        "MyAbstractCollection.prototype.iterator = function() {};");
-
-    testSets(js, "{iterator=[[MyAbstractCollection.prototype, MyIterable.prototype]]}");
-  }
-
-  public void testPropInParentInterface2() {
-    String js = LINE_JOINER.join(
-        "/** @interface */",
-        "function MyIterable() {}",
-        "MyIterable.prototype.iterator = function() {};",
-        "/**",
-        " * @interface",
-        " * @extends {MyIterable}",
-        " */",
-        "function MyCollection() {}",
-        "/**",
-        " * @constructor",
-        " * @implements {MyCollection<?>}",
-        " */",
-        "function MyAbstractCollection() {}",
-        "/** @override */",
-        "MyAbstractCollection.prototype.iterator = function() {};");
-
-    testSets(js, "{iterator=[[MyAbstractCollection.prototype, MyIterable.prototype]]}");
-  }
-
-  public void testPropInParentInterface3() {
-    String js = LINE_JOINER.join(
-        "/** @interface */",
-        "function MyIterable() {}",
-        "MyIterable.prototype.iterator = function() {};",
-        "/**",
-        " * @interface",
-        " * @extends {MyIterable}",
-        " */",
-        "function MyCollection() {}",
-        "/**",
-        " * @constructor",
-        " * @implements {MyCollection}",
-        " */",
-        "function MyAbstractCollection() {}",
-        "/** @override */",
-        "MyAbstractCollection.prototype.iterator = function() {};");
-
-    testSets(js, js, "{iterator=[[MyAbstractCollection.prototype, MyIterable.prototype]]}");
-  }
-
   public void testErrorOnProtectedProperty() {
     testError("function addSingletonGetter(foo) { foo.foobar = 'a'; };",
          DisambiguateProperties.Warnings.INVALIDATION);

diff --git a/test/com/google/javascript/jscomp/TypeCheckTest.java b/test/com/google/javascript/jscomp/TypeCheckTest.java
@@ -31,6 +31,7 @@
 import com.google.javascript.rhino.jstype.JSType;
 import com.google.javascript.rhino.jstype.JSTypeNative;
 import com.google.javascript.rhino.jstype.ObjectType;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -10145,13 +10146,17 @@ public void testInterfaceExtendsLoop() {
   }
 
   public void testInterfaceExtendsLoop2() {
-    testClosureTypes(
+    testClosureTypesMultipleWarnings(
         suppressMissingProperty("foo") +
             "/** @record \n * @extends {F} */var G = function() {};" +
             "/** @record \n * @extends {G} */var F = function() {};" +
             "/** @constructor \n * @implements {F} */var H = function() {};" +
         "alert((new H).foo);",
-        "Parse error. Cycle detected in inheritance chain of type F");
+        ImmutableList.of(
+            "extends loop involving F, "
+            + "loop: F -> G -> F",
+            "extends loop involving G, "
+            + "loop: G -> F -> G"));
   }
 
   public void testConversionFromInterfaceToRecursiveConstructor() {