Merge pull request #18632 from hvitved/rust/type-inference

Rust: Implement basic type inference in QL

Author: hvitved

rust/ql/.generated.list

@@ -0,0 +1,8 @@
+/**
+ * @name Path resolution inconsistencies
+ * @description Lists the path resolution inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/path-resolution-consistency
+ */
+
+import codeql.rust.internal.PathResolutionConsistency

rust/ql/.gitattributes

@@ -0,0 +1,8 @@
+/**
+ * @name Type inference inconsistencies
+ * @description Lists the type inference inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/type-inference-consistency
+ */
+
+import codeql.rust.internal.TypeInferenceConsistency

rust/ql/consistency-queries/PathResolutionConsistency.ql

@@ -8,6 +8,7 @@
 | Files extracted - without errors % | 80 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 0 |
 | Inconsistencies - data flow | 0 |
 | Lines of code extracted | 6 |
 | Lines of user code extracted | 6 |

rust/ql/consistency-queries/TypeInferenceConsistency.ql

@@ -8,6 +8,7 @@
 | Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 0 |
 | Inconsistencies - data flow | 0 |
 | Lines of code extracted | 9 |
 | Lines of user code extracted | 9 |

rust/ql/integration-tests/hello-project/summary.expected

@@ -8,6 +8,7 @@
 | Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 0 |
 | Inconsistencies - data flow | 0 |
 | Lines of code extracted | 9 |
 | Lines of user code extracted | 9 |

rust/ql/integration-tests/hello-workspace/summary.cargo.expected

@@ -239,9 +239,8 @@ final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
   pragma[nomagic]
   ExprCfgNode getFieldExpr(string field) {
     exists(RecordExprField ref |
-      ref = node.getRecordExprFieldList().getAField() and
-      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result) and
-      field = ref.getFieldName()
+      ref = node.getFieldExpr(field) and
+      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result)
     )
   }
 }

rust/ql/integration-tests/hello-workspace/summary.rust-project.expected

@@ -10,7 +10,7 @@ private import codeql.dataflow.internal.DataFlowImpl
 private import rust
 private import SsaImpl as SsaImpl
 private import codeql.rust.controlflow.internal.Scope as Scope
-private import codeql.rust.elements.internal.PathResolution
+private import codeql.rust.internal.PathResolution
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.Ssa
@@ -847,7 +847,7 @@ class TupleFieldContent extends FieldContent, TTupleFieldContent {
 
   predicate isStructField(Struct s, int pos) { field.isStructField(s, pos) }
 
-  override FieldExprCfgNode getAnAccess() { none() } // TODO
+  override FieldExprCfgNode getAnAccess() { field = result.getFieldExpr().getTupleField() }
 
   final override string toString() {
     exists(Variant v, int pos, string vname |
@@ -878,7 +878,7 @@ class RecordFieldContent extends FieldContent, TRecordFieldContent {
 
   predicate isStructField(Struct s, string name) { field.isStructField(s, name) }
 
-  override FieldExprCfgNode getAnAccess() { none() } // TODO
+  override FieldExprCfgNode getAnAccess() { field = result.getFieldExpr().getRecordField() }
 
   final override string toString() {
     exists(Variant v, string name, string vname |

rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll

@@ -12,11 +12,7 @@ private import codeql.rust.elements.Resolvable
  * be referenced directly.
  */
 module Impl {
-  private import codeql.rust.elements.internal.CallableImpl::Impl
-  private import codeql.rust.elements.internal.MethodCallExprImpl::Impl
-  private import codeql.rust.elements.internal.CallExprImpl::Impl
-  private import codeql.rust.elements.internal.PathExprImpl::Impl
-  private import codeql.rust.elements.internal.PathResolution
+  private import rust
 
   pragma[nomagic]
   Resolvable getCallResolvable(CallExprBase call) {
@@ -30,14 +26,7 @@ module Impl {
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
   class CallExprBase extends Generated::CallExprBase {
-    /**
-     * Gets the target callable of this call, if a unique such target can
-     * be statically resolved.
-     */
-    Callable getStaticTarget() {
-      getCallResolvable(this).resolvesAsItem(result)
-      or
-      result = resolvePath(this.(CallExpr).getFunction().(PathExpr).getPath())
-    }
+    /** Gets the static target of this call, if any. */
+    Callable getStaticTarget() { none() } // overridden by subclasses, but cannot be made abstract
   }
 }