Merge pull request github#5025 from asgerf/js/slow-xml-parent-upgrade-script

Approved by erik-krogh

Author: codeql-ci

javascript/upgrades/c8859f3725d4b070a877f8792214582d517c8a9b/toplevel_parent_xml_node.ql

@@ -1,18 +1,37 @@
+class Location extends @location {
+  string toString() { none() }
+
+  predicate startsAtLine(@file file, int line) { locations_default(this, file, line, _, _, _) }
+}
+
 class TopLevel extends @toplevel {
   string toString() { none() }
+
+  Location getLocation() { hasLocation(this, result) }
+
+  pragma[nomagic]
+  predicate startsAtLine(@file file, int line) { getLocation().startsAtLine(file, line) }
 }
 
 class XmlNode extends @xmllocatable {
   string toString() { none() }
+
+  Location getLocation() { xmllocations(this, result) }
+
+  pragma[nomagic]
+  predicate startsAtLine(@file file, int line) { getLocation().startsAtLine(file, line) }
 }
 
-// Based on previous implementation on HTMLNode.getCodeInAttribute and getInlineScript
+// Based on previous implementation on HTMLNode.getCodeInAttribute and getInlineScript,
+// with `startsAtLine` added for performance reasons.
 from
-  TopLevel top, XmlNode xml, @file f, @location l1, int sl1, int sc1, int el1, int ec1,
-  @location l2, int sl2, int sc2, int el2, int ec2
+  TopLevel top, XmlNode xml, @file f, Location l1, int sl1, int sc1, int el1, int ec1, Location l2,
+  int sl2, int sc2, int el2, int ec2
 where
-  xmllocations(xml, l1) and
-  hasLocation(top, l2) and
+  l1 = xml.getLocation() and
+  l2 = top.getLocation() and
+  xml.startsAtLine(f, sl1) and
+  top.startsAtLine(f, [sl1, sl1 + 1]) and
   locations_default(l1, f, sl1, sc1, el1, ec1) and
   locations_default(l2, f, sl2, sc2, el2, ec2) and
   (