Ruby: Move UnknownMethodCall to ast/Call.qll

hmac · hmac · commit eb4f333c2500 · 2022-02-17T20:44:04.000+13:00
diff --git a/ruby/ql/lib/codeql/ruby/ast/Call.qll b/ruby/ql/lib/codeql/ruby/ast/Call.qll
@@ -116,6 +116,16 @@ class MethodCall extends Call instanceof MethodCallImpl {
   }
 }
 
+/**
+ * A `Method` call that has no known target.
+ * These will typically be calls to methods inherited from a superclass.
+ * TODO: When API Graphs is able to resolve calls to methods like `Kernel.send`
+ * this class is no longer necessary and should be removed.
+ */
+class UnknownMethodCall extends MethodCall {
+  UnknownMethodCall() { not exists(this.(Call).getATarget()) }
+}
+
 /**
  * A call to a setter method.
  * ```rb
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Core.qll b/ruby/ql/lib/codeql/ruby/frameworks/Core.qll
@@ -8,14 +8,6 @@ import core.Module
 import core.Array
 import core.Regexp
 
-/**
- * A `Method` call that has no known target.
- * These will typically be calls to methods inherited from a superclass.
- */
-class UnknownMethodCall extends MethodCall {
-  UnknownMethodCall() { not exists(this.(Call).getATarget()) }
-}
-
 /**
  * A system command executed via subshell literal syntax.
  * E.g.
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/BasicObject.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/BasicObject.qll
@@ -1,7 +1,6 @@
 private import codeql.ruby.AST
 private import codeql.ruby.Concepts
 private import codeql.ruby.DataFlow
-private import codeql.ruby.frameworks.Core
 
 module BasicObject {
   /**
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
@@ -5,7 +5,6 @@ private import codeql.ruby.Concepts
 private import codeql.ruby.DataFlow
 private import codeql.ruby.dataflow.FlowSummary
 private import codeql.ruby.dataflow.internal.DataFlowDispatch
-private import codeql.ruby.frameworks.Core
 
 /** Modeling for the `Kernel` class. */
 module Kernel {
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Module.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Module.qll
@@ -1,7 +1,6 @@
 private import codeql.ruby.AST
 private import codeql.ruby.Concepts
 private import codeql.ruby.DataFlow
-private import codeql.ruby.frameworks.Core
 
 module Module {
   /**
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Object.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Object.qll
@@ -1,4 +1,4 @@
-private import codeql.ruby.frameworks.Core
+private import codeql.ruby.AST
 
 module Object {
   /**

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-private import codeql.ruby.frameworks.Core`
	`1`	`+private import codeql.ruby.AST`
`2`	`2`
`3`	`3`	`module Object {`
`4`	`4`	`/**`