[NTI] Remove undefined from the receiver type when registering stray …

…properties. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=148969041
google · Mar 2, 2017 · b5298fe · b5298fe
1 parent ecb07fd
commit b5298fe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/com/google/javascript/jscomp/GlobalTypeInfo.java b/src/com/google/javascript/jscomp/GlobalTypeInfo.java
@@ -1937,7 +1937,7 @@ private void visitOtherPropertyDeclaration(Node getProp) {
       if (recvType == null) {
         return;
       }
-      recvType = recvType.removeType(commonTypes.NULL);
+      recvType = recvType.removeType(commonTypes.NULL_OR_UNDEFINED);
       NominalType nt = recvType.getNominalTypeIfSingletonObj();
       // Don't add stray properties to Object.
       if (nt == null || nt.equals(commonTypes.getObjectType())) {

diff --git a/test/com/google/javascript/jscomp/NewTypeInferenceTest.java b/test/com/google/javascript/jscomp/NewTypeInferenceTest.java
@@ -19453,4 +19453,17 @@ public void testSuppressInvalidCasts() {
         "  /** @type {number} */ ('asdf');",
         "}"));
   }
+
+  public void testRegisterStrayPropertyOnReceiverWithUndefined() {
+    typeCheck(LINE_JOINER.join(
+        "/** @constructor */",
+        "function Foo() {}",
+        "function f(/** (!Foo|undefined) */ x) {",
+        "  x.myprop;",
+        "}",
+        "function g(/** !Foo */ x) {",
+        "  return x.myprop;",
+        "}"),
+        NewTypeInference.NULLABLE_DEREFERENCE);
+  }
 }