Revert "JS: Also use contextual types directly for underlying types"

This reverts commit 385e663.

Author: asgerf

javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll

@@ -229,10 +229,7 @@ module DataFlow {
     predicate hasUnderlyingType(string globalName) {
       Stages::TypeTracking::ref() and
       exists(NameResolution::Node type |
-        TypeResolution::valueHasType(this.getNameResolutionNode(), type)
-        or
-        TypeResolution::valueHasContextualType(this.getNameResolutionNode(), type)
-      |
+        TypeResolution::valueHasType(this.getNameResolutionNode(), type) and
         UnderlyingTypes::nodeHasUnderlyingType(type, "global", globalName)
       )
     }
@@ -246,10 +243,7 @@ module DataFlow {
       Stages::TypeTracking::ref() and
       moduleName != "global" and
       exists(NameResolution::Node type |
-        TypeResolution::valueHasType(this.getNameResolutionNode(), type)
-        or
-        TypeResolution::valueHasContextualType(this.getNameResolutionNode(), type)
-      |
+        TypeResolution::valueHasType(this.getNameResolutionNode(), type) and
         UnderlyingTypes::nodeHasUnderlyingType(type, moduleName, typeName)
       )
     }

javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll

@@ -114,22 +114,11 @@ module TypeResolution {
     )
   }
 
-  predicate valueHasContextualType(Node value, Node type) {
+  private predicate contextualType(Node value, Node contextualType) {
     exists(InvokeExpr call, Function target, int i |
       callTarget(call, target) and
       value = call.getArgument(i) and
-      type = target.getParameter(i).getTypeAnnotation()
-    )
-    or
-    exists(VariableDeclarator decl |
-      value = decl.getInit() and
-      type = decl.getTypeAnnotation()
-    )
-    or
-    exists(Function functionValue, Function functionType |
-      valueHasContextualType(functionValue, trackFunctionType(functionType)) and
-      value = functionValue.getAReturnedExpr() and
-      type = functionType.getReturnTypeAnnotation()
+      contextualType = target.getParameter(i).getTypeAnnotation()
     )
   }
 
@@ -165,10 +154,10 @@ module TypeResolution {
     or
     // Contextual typing for parameters
     exists(Function lambda, Function functionType, int i |
-      valueHasContextualType(lambda, trackFunctionType(functionType))
+      contextualType(lambda, trackFunctionType(functionType))
       or
       exists(InterfaceDefinition interface |
-        valueHasContextualType(lambda, trackType(interface)) and
+        contextualType(lambda, trackType(interface)) and
         functionType = interface.getACallSignature().getBody()
       )
     |