Ruby: prune more aggressively

Author: asgerf

ruby/ql/lib/codeql/ruby/typetracking/TypeTrackerSpecific.qll

@@ -451,7 +451,11 @@ private predicate hasWithContentSummary(
  * Holds if the given component can't be evaluated by `evaluateSummaryComponentStackLocal`.
  */
 pragma[nomagic]
-predicate isNonLocal(SummaryComponent component) { component = SC::content(_) }
+predicate isNonLocal(SummaryComponent component) {
+  component = SC::content(_)
+  or
+  component = SC::withContent(_)
+}
 
 /**
  * Gets a data flow node corresponding an argument or return value of `call`,
@@ -495,6 +499,14 @@ private predicate dependsOnSummaryComponentStackCons(
   dependsOnSummaryComponentStack(callable, SCS::push(head, tail))
 }
 
+pragma[nomagic]
+private predicate dependsOnSummaryComponentStackConsLocal(
+  SummarizedCallable callable, SummaryComponent head, SummaryComponentStack tail
+) {
+  dependsOnSummaryComponentStackCons(callable, head, tail) and
+  not isNonLocal(head)
+}
+
 pragma[nomagic]
 private predicate dependsOnSummaryComponentStackLeaf(
   SummarizedCallable callable, SummaryComponent leaf
@@ -515,7 +527,7 @@ private DataFlow::Node evaluateSummaryComponentStackLocal(
   or
   exists(DataFlow::Node prev, SummaryComponent head, SummaryComponentStack tail |
     prev = evaluateSummaryComponentStackLocal(callable, call, tail) and
-    dependsOnSummaryComponentStackCons(callable, pragma[only_bind_into](head),
+    dependsOnSummaryComponentStackConsLocal(callable, pragma[only_bind_into](head),
       pragma[only_bind_out](tail)) and
     stack = SCS::push(pragma[only_bind_out](head), pragma[only_bind_out](tail))
   |