Merge pull request #41669 from grynspan/jgrynspan/SR-15938-imagebase-linkage

[SR-15938] Error when referencing #dsohandle in a Swift test on Windows

Author: grynspan

lib/FrontendTool/TBD.cpp

@@ -56,6 +56,27 @@ bool swift::writeTBD(ModuleDecl *M, StringRef OutputFilename,
   return false;
 }
 
+/// Determine if a symbol name is ignored when validating the TBD's contents
+/// against the IR's.
+///
+/// \param name The name of the symbol in question.
+/// \param IRModule The module being validated.
+///
+/// \returns Whether or not the presence or absence of the symbol named \a name
+///   should be ignored (instead of potentially producing a diagnostic.)
+static bool isSymbolIgnored(const StringRef& name,
+                            const llvm::Module &IRModule) {
+  if (llvm::Triple(IRModule.getTargetTriple()).isOSWindows()) {
+    // (SR-15938) Error when referencing #dsohandle in a Swift test on Windows
+    // On Windows, ignore the lack of __ImageBase in the TBD file.
+    if (name == "__ImageBase") {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 static bool validateSymbols(DiagnosticEngine &diags,
                             const std::vector<std::string> &symbols,
                             const llvm::Module &IRModule,
@@ -77,6 +98,11 @@ static bool validateSymbols(DiagnosticEngine &diags,
     // with what TBDGen created.
     auto unmangledName = nameValue.getKey();
 
+    if (isSymbolIgnored(unmangledName, IRModule)) {
+      // This symbol should not affect validation. Skip it.
+      continue;
+    }
+
     SmallString<128> name;
     llvm::Mangler::getNameWithPrefix(name, unmangledName,
                                      IRModule.getDataLayout());

test/Frontend/dsohandle-linkable.swift

@@ -0,0 +1,16 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+// (SR-15938) Error when referencing #dsohandle in a Swift test on Windows
+// This file tests that #dsohandle is fully usable from the built test. The
+// precise value of #dsohandle is uninteresting.
+
+import StdlibUnittest
+
+var tests = TestSuite("#dsohandle usable")
+
+tests.test("#dsohandle usable") {
+    expectNotNil(#dsohandle as UnsafeRawPointer?)
+}
+
+runAllTests()

validation-test/execution/dsohandle-multi-module.swift

@@ -9,7 +9,6 @@
 // REQUIRES: executable_test
 
 // UNSUPPORTED: linux
-// XFAIL: windows
 
 import first
 import second