Refactor prototype reference retrieval in ClassNode and update expected test output

Author: Napalys

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

@@ -1413,22 +1413,26 @@ module ClassNode {
      * Only applies to function-style classes.
      */
     DataFlow::SourceNode getAPrototypeReference() {
-      (
-        exists(DataFlow::SourceNode base | base = getAFunctionValueWithPrototype(function) |
-          result = base.getAPropertyRead("prototype")
-          or
-          result = base.getAPropertySource("prototype")
-        )
+      exists(DataFlow::SourceNode base | base = getAFunctionValueWithPrototype(function) |
+        result = base.getAPropertyRead("prototype")
         or
-        exists(string name |
-          this = AccessPath::getAnAssignmentTo(name) and
-          result = getAPrototypeReferenceInFile(name, this.getFile())
-        )
-        or
-        exists(ExtendCall call |
-          call.getDestinationOperand() = this.getAPrototypeReference() and
-          result = call.getASourceOperand()
-        )
+        result = base.getAPropertySource("prototype")
+      )
+      or
+      exists(string name |
+        this = AccessPath::getAnAssignmentTo(name) and
+        result = getAPrototypeReferenceInFile(name, this.getFile())
+      )
+      or
+      exists(ExtendCall call |
+        call.getDestinationOperand() = this.getAPrototypeReference() and
+        result = call.getASourceOperand()
+      )
+      or
+      exists(DataFlow::PropRead protoRead |
+        protoRead.getPropertyName() = "prototype" and
+        protoRead.getBase().analyze().getAValue() = this.analyze().getAValue() and
+        result = protoRead
       )
     }
 

javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/Test.expected

@@ -2,8 +2,6 @@ spuriousCallee
 missingCallee
 | constructor-field.ts:40:5:40:14 | f3.build() | constructor-field.ts:13:3:13:12 | build() {} | -1 | calls |
 | constructor-field.ts:71:1:71:11 | bf3.build() | constructor-field.ts:13:3:13:12 | build() {} | -1 | calls |
-| prototypes.js:96:5:96:15 | this.read() | prototypes.js:104:27:104:39 | function() {} | -1 | calls |
-| prototypes.js:96:5:96:15 | this.read() | prototypes.js:109:27:109:39 | function() {} | -1 | calls |
 badAnnotation
 accessorCall
 | accessors.js:12:1:12:5 | obj.f | accessors.js:5:8:5:12 | () {} |