Updated tests

Author: meg-gupta

test/ModuleInterface/ossa-modules/Inputs/sdk-test-stdlib-no-ossa-referent-with-rebuild-remark.swift

@@ -1,5 +1,9 @@
 
 import Swift // expected-remark {{rebuilding module 'Swift'}}
+// expected-note @-1 {{compiled module is out of date}}
+// expected-note @-2 {{unable to load compiled module}}
+// expected-note @-3 {{prebuilt module is out of date}}
+// expected-note @-4 {{unable to load compiled module}}
 
 func main() {
   let f = foo() // expected-warning {{initialization of immutable value 'f' was never used}}

test/ModuleInterface/ossa-modules/different-modes-have-different-hashes.swift

@@ -68,16 +68,18 @@
 // RUN: %target-swift-frontend -typecheck -sdk '' -module-cache-path %t/MCP.default -parse-stdlib -I %t %t/test.default.remark.swift -Rmodule-interface-rebuild -verify
 // RUN: ls %t/MCP.default | count 3
 // RUN: %target-swift-frontend -typecheck -sdk '' -module-cache-path %t/MCP.default -parse-stdlib -I %t %t/test.default.swift -Rmodule-interface-rebuild -verify
-// RUN: %target-sil-opt -module-name SwiftModuleDefault %t/MCP.default/*.swiftmodule | grep '@$s18SwiftModuleDefault3fooAA5KlassCyF' | grep '[[]ossa[]]'
+// RUN: %target-sil-opt -module-name SwiftModuleDefault %t/MCP.default/*.swiftmodule > %t/MCP.default/old/first.sil
+// RUN: cat %t/MCP.default/old/first.sil | grep '@$s18SwiftModuleDefault3fooAA5KlassCyF' | grep '[[]ossa[]]'
 // RUN: mv %t/MCP.default/*.swiftmodule %t/MCP.default/old
 // RUN: ls %t/MCP.default | count 2
 // RUN: %target-swift-frontend -typecheck -sdk '' -enable-ossa-modules -module-cache-path %t/MCP.default -parse-stdlib -I %t %t/test.default.remark.swift -Rmodule-interface-rebuild -verify
 // RUN: ls %t/MCP.default | count 3
 // RUN: %target-swift-frontend -typecheck -sdk '' -enable-ossa-modules -module-cache-path %t/MCP.default -parse-stdlib -I %t %t/test.default.swift -Rmodule-interface-rebuild -verify
 // RUN: ls %t/MCP.default | count 3
+// RUN: %target-sil-opt -module-name SwiftModuleDefault %t/MCP.default/*.swiftmodule > %t/MCP.default/second.sil
 //
 // These should be the same.
-// RUN: diff -u %t/MCP.default/*.swiftmodule %t/MCP.default/old/*.swiftmodule
+// RUN: diff -u %t/MCP.default/old/first.sil %t/MCP.default/second.sil
 //
 // But their actual names should be different since the hash is in the file name.
 // RUN: cd %t/MCP.default && ls *.swiftmodule > %t/MCP.default/firstFile
@@ -103,7 +105,6 @@
 // RUN: ls %t/MCP.Onone | count 3
 //
 // These should be the same.
-// RUN: diff -u %t/MCP.Onone/*.swiftmodule %t/MCP.Onone/old/*.swiftmodule
 //
 // But their name should be different
 // RUN: cd %t/MCP.Onone && ls *.swiftmodule > %t/MCP.Onone/firstFile

test/ModuleInterface/ossa-modules/sdk-test-stdlib-ossa.swift

@@ -21,13 +21,9 @@
 
 // RUN: %target-swift-frontend -typecheck -sdk '%t/SDK' -prebuilt-module-cache-path '%t/PreBuiltSDKModules' -module-cache-path %t/TempModuleCacheOther -resource-dir '' -parse-stdlib -Rmodule-interface-rebuild %S/Inputs/sdk-test-stdlib-no-ossa-referent-no-rebuild-remark.swift -verify
 
-// In this case, we should rebuild.
+// In this case also, we should not rebuild.
 
-// RUN: %target-swift-frontend -typecheck -sdk '%t/SDK' -prebuilt-module-cache-path '%t/PreBuiltSDKModules' -module-cache-path %t/TempModuleCacheOther -resource-dir '' -parse-stdlib -Rmodule-interface-rebuild %S/Inputs/sdk-test-stdlib-no-ossa-referent-with-rebuild-remark.swift -verify -enable-ossa-modules
-
-// Make sure the rebuild is in OSSA.
-
-// RUN: %target-sil-opt -module-name Swift %t/PreBuiltSDKModules/Swift.swiftmodule/*.swiftmodule | grep '@$ss3foos5KlassCyF' | grep '[[]ossa[]]'
+// RUN: %target-swift-frontend -typecheck -sdk '%t/SDK' -prebuilt-module-cache-path '%t/PreBuiltSDKModules' -module-cache-path %t/TempModuleCacheOther -resource-dir '' -parse-stdlib -Rmodule-interface-rebuild %S/Inputs/sdk-test-stdlib-no-ossa-referent-no-rebuild-remark.swift -verify -enable-ossa-modules
 
 // Flacky hangs: rdar://77288690
 // UNSUPPORTED: CPU=arm64, CPU=arm64e

unittests/ClangImporter/ClangImporterTests.cpp

@@ -70,14 +70,15 @@ TEST(ClangImporterTest, emitPCHInMemory) {
   // Set up the importer and emit a bridging PCH.
   swift::LangOptions langOpts;
   langOpts.Target = llvm::Triple("x86_64", "apple", "darwin");
+  swift::SILOptions silOpts;
   swift::TypeCheckerOptions typeckOpts;
   INITIALIZE_LLVM();
   swift::SearchPathOptions searchPathOpts;
   swift::symbolgraphgen::SymbolGraphOptions symbolGraphOpts;
   swift::SourceManager sourceMgr;
   swift::DiagnosticEngine diags(sourceMgr);
   std::unique_ptr<ASTContext> context(
-      ASTContext::get(langOpts, typeckOpts, searchPathOpts, options,
+      ASTContext::get(langOpts, typeckOpts, silOpts, searchPathOpts, options,
                       symbolGraphOpts, sourceMgr, diags));
   auto importer = ClangImporter::create(*context);
 

unittests/FrontendTool/ModuleLoadingTests.cpp

@@ -103,9 +103,8 @@ class ModuleInterfaceLoaderTest : public testing::Test {
     ClangImporterOptions clangImpOpts;
     symbolgraphgen::SymbolGraphOptions symbolGraphOpts;
     SILOptions silOpts;
-    auto ctx =
-        ASTContext::get(langOpts, typeckOpts, searchPathOpts, clangImpOpts,
-                        symbolGraphOpts, sourceMgr, diags);
+    auto ctx = ASTContext::get(langOpts, typeckOpts, silOpts, searchPathOpts,
+                               clangImpOpts, symbolGraphOpts, sourceMgr, diags);
 
     ctx->addModuleInterfaceChecker(
       std::make_unique<ModuleInterfaceCheckerImpl>(*ctx, cacheDir,
@@ -149,7 +148,8 @@ class ModuleInterfaceLoaderTest : public testing::Test {
     ASSERT_TRUE(bufOrErr);
 
     auto bufData = (*bufOrErr)->getBuffer();
-    auto validationInfo = serialization::validateSerializedAST(bufData);
+    auto validationInfo = serialization::validateSerializedAST(
+        bufData, silOpts.EnableOSSAModules);
     ASSERT_EQ(serialization::Status::Valid, validationInfo.status);
     ASSERT_EQ(bufData, moduleBuffer->getBuffer());
   }

unittests/Parse/TokenizerTests.cpp

@@ -82,8 +82,8 @@ class TokenizerTest : public ::testing::Test {
   }
 
   std::vector<Token> parseAndGetSplitTokens(unsigned BufID) {
-    swift::ParserUnit PU(SM, SourceFileKind::Main, BufID,
-                         LangOpts, TypeCheckerOptions(), "unknown");
+    swift::ParserUnit PU(SM, SourceFileKind::Main, BufID, LangOpts,
+                         TypeCheckerOptions(), SILOptions(), "unknown");
     SmallVector<Decl *, 8> decls;
     PU.getParser().parseTopLevel(decls);
     return PU.getParser().getSplitTokens();

unittests/Sema/SemaFixture.cpp

@@ -29,9 +29,9 @@ using namespace swift::unittest;
 using namespace swift::constraints::inference;
 
 SemaTest::SemaTest()
-    : Context(*ASTContext::get(LangOpts, TypeCheckerOpts, SearchPathOpts,
-                               ClangImporterOpts, SymbolGraphOpts,
-                               SourceMgr, Diags)) {
+    : Context(*ASTContext::get(LangOpts, TypeCheckerOpts, SILOpts,
+                               SearchPathOpts, ClangImporterOpts,
+                               SymbolGraphOpts, SourceMgr, Diags)) {
   INITIALIZE_LLVM();
 
   registerParseRequestFunctions(Context.evaluator);

unittests/Sema/SemaFixture.h

@@ -38,6 +38,7 @@ class SemaTestBase : public ::testing::Test {
 public:
   LangOptions LangOpts;
   TypeCheckerOptions TypeCheckerOpts;
+  SILOptions SILOpts;
   SearchPathOptions SearchPathOpts;
   ClangImporterOptions ClangImporterOpts;
   symbolgraphgen::SymbolGraphOptions SymbolGraphOpts;