Merge pull request #70251 from CodaFi/mangle-tangle

Author: CodaFi

lib/AST/ASTDemangler.cpp

@@ -1031,7 +1031,14 @@ ASTBuilder::createTypeDecl(NodePointer node,
 ModuleDecl *
 ASTBuilder::findModule(NodePointer node) {
   assert(node->getKind() == Demangle::Node::Kind::Module);
-  const auto &moduleName = node->getText();
+  const auto moduleName = node->getText();
+  // Respect the main module's ABI name when we're trying to resolve
+  // mangled names. But don't touch anything under the Swift stdlib's
+  // umbrella. 
+  if (Ctx.MainModule && Ctx.MainModule->getABIName().is(moduleName))
+    if (!Ctx.MainModule->getABIName().is(STDLIB_NAME))
+      return Ctx.MainModule;
+
   return Ctx.getModuleByName(moduleName);
 }
 

test/ModuleInterface/Inputs/opaque-type-abi-name/Bottom.swiftinterface

@@ -0,0 +1,23 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name Bottom -module-abi-name Top -module-interface-preserve-types-as-written
+
+import Swift
+
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+public protocol Aspect {
+  associatedtype Orientation : Bottom.Aspect
+  var orientation: Self.Orientation { get }
+}
+
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+public struct Parameter {
+}
+
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+public struct ReferencesTop {
+  @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+  public func orientation(of parameter: Bottom.Parameter) -> some Bottom.Aspect
+
+  @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+  public typealias Orientation = @_opaqueReturnTypeOf("$s3Top13ReferencesTopV11orientation2ofQrAA9ParameterV_tF", 0) __
+}

test/ModuleInterface/Inputs/opaque-type-abi-name/Top.swiftinterface

@@ -0,0 +1,4 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name Top -module-interface-preserve-types-as-written
+
+@_exported import Bottom

test/ModuleInterface/verify-opaque-type-abi-name.swift

@@ -0,0 +1,4 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-typecheck-module-from-interface(%S/Inputs/opaque-type-abi-name/Bottom.swiftinterface) -module-name Bottom -o %t/Bottom.swiftmodule -verify
+// RUN: %target-swift-typecheck-module-from-interface(%S/Inputs/opaque-type-abi-name/Top.swiftinterface) -module-name Top -o %t/Top.swiftmodule -verify -I %S/Inputs/opaque-type-abi-name