Swift: failing tests for linkage awareness

redsun82 · redsun82 · commit 20eaa3448514 · 2023-01-18T10:07:46.000+01:00
diff --git a/swift/integration-tests/posix-only/cross-references/Module.expected b/swift/integration-tests/posix-only/cross-references/Module.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | cross_references |
diff --git a/swift/integration-tests/posix-only/cross-references/Module.ql b/swift/integration-tests/posix-only/cross-references/Module.ql
@@ -0,0 +1,6 @@
+import swift
+
+// check that the `cross_references` module has exactly one entity in the DB
+from ModuleDecl m
+where m.getName() = "cross_references"
+select m
diff --git a/swift/integration-tests/posix-only/frontend-invocations/F1.swift b/swift/integration-tests/posix-only/frontend-invocations/F1.swift
@@ -1 +1 @@
-func foo() {}
+public func foo() {}
diff --git a/swift/integration-tests/posix-only/frontend-invocations/F2.swift b/swift/integration-tests/posix-only/frontend-invocations/F2.swift
@@ -1 +1 @@
-func bar() {}
+public func bar() {}
diff --git a/swift/integration-tests/posix-only/frontend-invocations/F3.swift b/swift/integration-tests/posix-only/frontend-invocations/F3.swift
@@ -0,0 +1 @@
+public func baz() {}
diff --git a/swift/integration-tests/posix-only/frontend-invocations/F4.swift b/swift/integration-tests/posix-only/frontend-invocations/F4.swift
@@ -0,0 +1 @@
+public func bazz() {}
diff --git a/swift/integration-tests/posix-only/frontend-invocations/F5.swift b/swift/integration-tests/posix-only/frontend-invocations/F5.swift
@@ -0,0 +1,9 @@
+import F
+import Fs
+
+func use_imported() {
+    F.foo()
+    F.bar()
+    Fs.baz()
+    Fs.bazz()
+}
diff --git a/swift/integration-tests/posix-only/frontend-invocations/Files.expected b/swift/integration-tests/posix-only/frontend-invocations/Files.expected
@@ -5,7 +5,11 @@
 | E.swift:0:0:0:0 | E.swift |
 | F1.swift:0:0:0:0 | F1.swift |
 | F2.swift:0:0:0:0 | F2.swift |
+| F3.swift:0:0:0:0 | F3.swift |
+| F5.swift:0:0:0:0 | F5.swift |
 | G.swift:0:0:0:0 | G.swift |
 | H1.swift:0:0:0:0 | H1.swift |
 | H2.swift:0:0:0:0 | H2.swift |
+| I1.swift:0:0:0:0 | I1.swift |
+| I2.swift:0:0:0:0 | I2.swift |
 | file://:0:0:0:0 |  |
diff --git a/swift/integration-tests/posix-only/frontend-invocations/I1.swift b/swift/integration-tests/posix-only/frontend-invocations/I1.swift
@@ -0,0 +1 @@
+let I1 = ""
diff --git a/swift/integration-tests/posix-only/frontend-invocations/I2.swift b/swift/integration-tests/posix-only/frontend-invocations/I2.swift
@@ -0,0 +1 @@
+let I2 = ""
diff --git a/swift/integration-tests/posix-only/frontend-invocations/Modules.expected b/swift/integration-tests/posix-only/frontend-invocations/Modules.expected
@@ -0,0 +1,15 @@
+| file://:0:0:0:0 | A |
+| file://:0:0:0:0 | B |
+| file://:0:0:0:0 | Builtin |
+| file://:0:0:0:0 | C |
+| file://:0:0:0:0 | D |
+| file://:0:0:0:0 | E |
+| file://:0:0:0:0 | F |
+| file://:0:0:0:0 | F5 |
+| file://:0:0:0:0 | Fs |
+| file://:0:0:0:0 | G |
+| file://:0:0:0:0 | H1 |
+| file://:0:0:0:0 | I1 |
+| file://:0:0:0:0 | Swift |
+| file://:0:0:0:0 | SwiftOnoneSupport |
+| file://:0:0:0:0 | SwiftShims |
diff --git a/swift/integration-tests/posix-only/frontend-invocations/Modules.ql b/swift/integration-tests/posix-only/frontend-invocations/Modules.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ModuleDecl m
+where m.getName().charAt(0) != "_"
+select m
diff --git a/swift/integration-tests/posix-only/frontend-invocations/build.sh b/swift/integration-tests/posix-only/frontend-invocations/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 if [[ "$(uname)" == Darwin ]]; then
   SDK="-sdk $(xcrun -show-sdk-path)"
@@ -8,16 +8,22 @@ else
   FRONTEND="swift-frontend"
 fi
 
+function invoke() {
+  $FRONTEND -frontend "$@" $SDK
+}
+
 rm -rf *.swiftmodule *.o
 
-$FRONTEND -frontend -c A.swift $SDK
-$FRONTEND -frontend -c B.swift -o B.o $SDK
-$FRONTEND -frontend -c -primary-file C.swift $SDK
-$FRONTEND -frontend -c -primary-file D.swift -o D.o $SDK
-$FRONTEND -frontend -c -primary-file E.swift Esup.swift -o E.o $SDK
-$FRONTEND -frontend -emit-module -primary-file F1.swift F2.swift -module-name F -o F1.swiftmodule $SDK
-$FRONTEND -frontend -emit-module F1.swift -primary-file F2.swift -module-name F -o F2.swiftmodule $SDK
-$FRONTEND -frontend -emit-module F1.swift F2.swift -o Fs.swiftmodule $SDK
-$FRONTEND -frontend -merge-modules F1.swiftmodule F2.swiftmodule -o F.swiftmodule $SDK
-( cd dir; $FRONTEND -frontend -c ../G.swift $SDK )
-$FRONTEND -frontend -c -primary-file H1.swift -primary-file H2.swift H3.swift -emit-module-path H1.swiftmodule -emit-module-path H2.swiftmodule -o H1.o -o H2.o $SDK
+invoke -c A.swift
+invoke -c B.swift -o B.o
+invoke -c -primary-file C.swift
+invoke -c -primary-file D.swift -o D.o
+invoke -c -primary-file E.swift Esup.swift -o E.o
+invoke -emit-module -primary-file F1.swift F2.swift -module-name F -o F1.swiftmodule
+invoke -emit-module F1.swift -primary-file F2.swift -module-name F -o F2.swiftmodule
+invoke -emit-module F3.swift F4.swift -o Fs.swiftmodule
+invoke -emit-module -merge-modules F1.swiftmodule F2.swiftmodule -o F.swiftmodule
+invoke -c F5.swift -o F5.o -I.
+( cd dir; invoke -c ../G.swift )
+invoke -c -primary-file H1.swift -primary-file H2.swift H3.swift -emit-module-path H1.swiftmodule -emit-module-path H2.swiftmodule -o H1.o -o H2.o
+invoke -emit-module -primary-file I1.swift -primary-file I2.swift -o I1.swiftmodule -o I2.swiftmodule
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Bodies.expected b/swift/integration-tests/posix-only/linkage-awareness/Bodies.expected
@@ -0,0 +1,2 @@
+| Foo1/Sources/foo/main.swift:1:1:1:31 | foo() | Foo1/Sources/foo/main.swift:1:19:1:31 | { ... } |
+| Foo2/Sources/foo/main.swift:2:1:2:32 | foo() | Foo2/Sources/foo/main.swift:2:19:2:32 | { ... } |
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Bodies.ql b/swift/integration-tests/posix-only/linkage-awareness/Bodies.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ConcreteFuncDecl decl, BraceStmt body
+where decl.getName() = "foo()" and decl.getBody() = body
+select decl, body
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Foo1/Package.swift b/swift/integration-tests/posix-only/linkage-awareness/Foo1/Package.swift
@@ -0,0 +1,17 @@
+// swift-tools-version: 5.7
+
+import PackageDescription
+
+let package = Package(
+        name: "Foo",
+        products: [
+            .executable(
+                    name: "foo",
+                    targets: ["foo"]),
+        ],
+        targets: [
+            .executableTarget(
+                    name: "foo",
+                    dependencies: []),
+        ]
+)
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Foo1/Sources/foo/main.swift b/swift/integration-tests/posix-only/linkage-awareness/Foo1/Sources/foo/main.swift
@@ -0,0 +1,3 @@
+func foo() -> Int { return 42 }
+
+print(foo())
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Foo2/Package.swift b/swift/integration-tests/posix-only/linkage-awareness/Foo2/Package.swift
@@ -0,0 +1,17 @@
+// swift-tools-version: 5.7
+
+import PackageDescription
+
+let package = Package(
+        name: "Foo",
+        products: [
+            .executable(
+                    name: "foo",
+                    targets: ["foo"]),
+        ],
+        targets: [
+            .executableTarget(
+                    name: "foo",
+                    dependencies: []),
+        ]
+)
diff --git a/swift/integration-tests/posix-only/linkage-awareness/Foo2/Sources/foo/main.swift b/swift/integration-tests/posix-only/linkage-awareness/Foo2/Sources/foo/main.swift
@@ -0,0 +1,5 @@
+
+func foo() -> Int { return 404 }
+
+
+print(foo())
diff --git a/swift/integration-tests/posix-only/linkage-awareness/build.sh b/swift/integration-tests/posix-only/linkage-awareness/build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for dir in Foo1 Foo2; do
+  (
+    cd $dir
+    swift package clean
+    swift build
+  )
+done
diff --git a/swift/integration-tests/posix-only/linkage-awareness/test.py b/swift/integration-tests/posix-only/linkage-awareness/test.py
@@ -0,0 +1,5 @@
+from create_database_utils import *
+
+run_codeql_database_create([
+    './build.sh',
+], lang='swift', keep_trap=True)
diff --git a/swift/integration-tests/posix-only/partial-modules/test.py b/swift/integration-tests/posix-only/partial-modules/test.py
@@ -1,7 +1,6 @@
 from create_database_utils import *
 
 run_codeql_database_create([
-    'env',
     'swift package clean',
     'swift build'
 ], lang='swift', keep_trap=True)
