Verify The Entire Compilation Session

The old tests were just running the type checker because we used to only emit reference dependencies after Sema. Now that we emit them after the pipeline has run, let's upgrade these tests to capture these new references.

Author: CodaFi

test/Incremental/Verifier/multi-file-private/Inputs/Derived.swift

@@ -1,18 +1,21 @@
 final public class OpenSubclass: OpenBase {} // expected-provides {{OpenSubclass}} expected-private-superclass {{main.OpenBase}}
 // expected-provides {{OpenBase}}
 // expected-private-member {{main.OpenBase.init}}
+// expected-private-member {{main.OpenBase.deinit}}
 // expected-private-member {{main.OpenSubclass.init}}
 // expected-private-member {{main.OpenSubclass.deinit}}
 
 final public class PublicSubclass: PublicBase {} // expected-provides {{PublicSubclass}} expected-private-superclass {{main.PublicBase}}
 // expected-provides {{PublicBase}}
 // expected-private-member {{main.PublicBase.init}}
+// expected-private-member {{main.PublicBase.deinit}}
 // expected-private-member {{main.PublicSubclass.init}}
 // expected-private-member {{main.PublicSubclass.deinit}}
 
 final internal class InternalSubclass: InternalBase {} // expected-provides {{InternalSubclass}} expected-private-superclass {{main.InternalBase}}
 // expected-provides {{InternalBase}}
 // expected-private-member {{main.InternalBase.init}}
+// expected-private-member {{main.InternalBase.deinit}}
 // expected-private-member {{main.InternalSubclass.init}}
 // expected-private-member {{main.InternalSubclass.deinit}}
 

test/Incremental/Verifier/multi-file-private/main.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %{python} %S/../gen-output-file-map.py -o %t %S/Inputs -r %t.resp
-// RUN: cd %t && %target-swiftc_driver -typecheck -output-file-map %t/output.json -incremental -module-name main -experimental-private-intransitive-dependencies -verify-incremental-dependencies @%t.resp
-// RUN: cd %t && %target-swiftc_driver -typecheck -output-file-map %t/output.json -incremental -enable-batch-mode -module-name main -experimental-private-intransitive-dependencies -verify-incremental-dependencies @%t.resp
+// RUN: cd %t && %target-swiftc_driver -c -output-file-map %t/output.json -incremental -module-name main -experimental-private-intransitive-dependencies -verify-incremental-dependencies @%t.resp
+// RUN: cd %t && %target-swiftc_driver -c -output-file-map %t/output.json -incremental -enable-batch-mode -module-name main -experimental-private-intransitive-dependencies -verify-incremental-dependencies @%t.resp
 
 // N.B. These tests are meant to continue to expand to more and more input files
 // as more kinds of cross-type dependencies are discovered. This will naturally

test/Incremental/Verifier/multi-file/Inputs/Derived.swift

@@ -1,18 +1,21 @@
 final public class OpenSubclass: OpenBase {} // expected-provides {{OpenSubclass}} expected-cascading-superclass {{main.OpenBase}}
 // expected-provides {{OpenBase}}
 // expected-cascading-member {{main.OpenBase.init}}
+// expected-private-member {{main.OpenBase.deinit}}
 // expected-cascading-member {{main.OpenSubclass.init}}
 // expected-private-member {{main.OpenSubclass.deinit}}
 
 final public class PublicSubclass: PublicBase {} // expected-provides {{PublicSubclass}} expected-cascading-superclass {{main.PublicBase}}
 // expected-provides {{PublicBase}}
 // expected-cascading-member {{main.PublicBase.init}}
+// expected-private-member {{main.PublicBase.deinit}}
 // expected-cascading-member {{main.PublicSubclass.init}}
 // expected-private-member {{main.PublicSubclass.deinit}}
 
 final internal class InternalSubclass: InternalBase {} // expected-provides {{InternalSubclass}} expected-cascading-superclass {{main.InternalBase}}
 // expected-provides {{InternalBase}}
 // expected-cascading-member {{main.InternalBase.init}}
+// expected-private-member {{main.InternalBase.deinit}}
 // expected-cascading-member {{main.InternalSubclass.init}}
 // expected-private-member {{main.InternalSubclass.deinit}}
 

test/Incremental/Verifier/multi-file/main.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %{python} %S/../gen-output-file-map.py -o %t %S/Inputs -r %t.resp
-// RUN: cd %t && %target-swiftc_driver -typecheck -output-file-map %t/output.json -incremental -module-name main -verify-incremental-dependencies @%t.resp
-// RUN: cd %t && %target-swiftc_driver -typecheck -output-file-map %t/output.json -incremental -enable-batch-mode -module-name main -verify-incremental-dependencies @%t.resp
+// RUN: cd %t && %target-swiftc_driver -c -output-file-map %t/output.json -incremental -module-name main -verify-incremental-dependencies @%t.resp
+// RUN: cd %t && %target-swiftc_driver -c -output-file-map %t/output.json -incremental -enable-batch-mode -module-name main -verify-incremental-dependencies @%t.resp
 
 // N.B. These tests are meant to continue to expand to more and more input files
 // as more kinds of cross-type dependencies are discovered. This will naturally