Swift: extract DynamicLookupExpr

redsun82 · redsun82 · commit 1a062823ee14 · 2022-11-09T16:31:59.000+01:00
diff --git a/swift/extractor/translators/ExprTranslator.cpp b/swift/extractor/translators/ExprTranslator.cpp
@@ -543,11 +543,19 @@ codeql::OverloadedDeclRefExpr ExprTranslator::translateOverloadedDeclRefExpr(
   entry.possible_declarations = dispatcher.fetchRepeatedLabels(expr.getDecls());
   return entry;
 }
+
 codeql::DynamicMemberRefExpr ExprTranslator::translateDynamicMemberRefExpr(
     const swift::DynamicMemberRefExpr& expr) {
   auto entry = createExprEntry(expr);
   fillLookupExpr(expr, entry);
   return entry;
 }
 
+codeql::DynamicSubscriptExpr ExprTranslator::translateDynamicSubscriptExpr(
+    const swift::DynamicSubscriptExpr& expr) {
+  auto entry = createExprEntry(expr);
+  fillLookupExpr(expr, entry);
+  return entry;
+}
+
 }  // namespace codeql
diff --git a/swift/extractor/translators/ExprTranslator.h b/swift/extractor/translators/ExprTranslator.h
@@ -107,6 +107,8 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
       const swift::OverloadedDeclRefExpr& expr);
   codeql::DynamicMemberRefExpr translateDynamicMemberRefExpr(
       const swift::DynamicMemberRefExpr& expr);
+  codeql::DynamicSubscriptExpr translateDynamicSubscriptExpr(
+      const swift::DynamicSubscriptExpr& expr);
 
  private:
   void fillAbstractClosureExpr(const swift::AbstractClosureExpr& expr,
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected
@@ -0,0 +1,2 @@
+| dynamic_lookup.swift:15:1:15:3 | .foo(_:) | DynamicMemberRefExpr | getBase: | dynamic_lookup.swift:15:1:15:1 | OpaqueValueExpr |
+| dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | DynamicSubscriptExpr | getBase: | dynamic_lookup.swift:16:5:16:5 | OpaqueValueExpr |
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql
@@ -2,9 +2,9 @@
 import codeql.swift.elements
 import TestUtils
 
-from DynamicMemberRefExpr x, Expr getBase
+from DynamicLookupExpr x, Expr getBase
 where
   toBeTested(x) and
   not x.isUnknown() and
   getBase = x.getBase()
-select x, "getBase:", getBase
+select x, x.getPrimaryQlClasses(), "getBase:", getBase
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getMember.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getMember.expected
@@ -0,0 +1,2 @@
+| dynamic_lookup.swift:15:1:15:3 | .foo(_:) | dynamic_lookup.swift:6:9:6:28 | foo(_:) |
+| dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | dynamic_lookup.swift:7:9:9:3 | subscript ... |
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getMember.ql b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getMember.ql
@@ -2,6 +2,6 @@
 import codeql.swift.elements
 import TestUtils
 
-from DynamicMemberRefExpr x
+from DynamicLookupExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getMember()
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getType.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getType.expected
@@ -0,0 +1,2 @@
+| dynamic_lookup.swift:15:1:15:3 | .foo(_:) | ((Int) -> ())? |
+| dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | Int? |
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getType.ql b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getType.ql
@@ -2,6 +2,6 @@
 import codeql.swift.elements
 import TestUtils
 
-from DynamicMemberRefExpr x
+from DynamicLookupExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getType()
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/dynamic_lookup.swift b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/dynamic_lookup.swift
@@ -4,9 +4,13 @@
 // Successful compilation would require importing Foundation for `@objc`
 class A {
   @objc func foo(_ : Int) {}
+  @objc subscript(i : Int) -> Int {
+    get { return 0 }
+  }
 };
 
 class B {}
 
 var x : AnyObject = B()
 x.foo!(17)
+_ = x[17]!
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr.expected
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr_getMember.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr_getMember.expected
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr_getType.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicMemberRefExpr/DynamicMemberRefExpr_getType.expected
diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicSubscriptExpr/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/expr/DynamicSubscriptExpr/MISSING_SOURCE.txt
diff --git a/swift/schema.py b/swift/schema.py
@@ -523,6 +523,7 @@ class DifferentiableFunctionExtractOriginalExpr(ImplicitConversionExpr):
 class DotSelfExpr(IdentityExpr):
     pass
 
+@qltest.collapse_hierarchy
 class DynamicLookupExpr(LookupExpr):
     pass
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| dynamic_lookup.swift:15:1:15:3 \| .foo(_:) \| DynamicMemberRefExpr \| getBase: \| dynamic_lookup.swift:15:1:15:1 \| OpaqueValueExpr \|`
	`2`	`+\| dynamic_lookup.swift:16:5:16:9 \| subscript ...[...] \| DynamicSubscriptExpr \| getBase: \| dynamic_lookup.swift:16:5:16:5 \| OpaqueValueExpr \|`