averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Availability

Browse Source
This commit is contained in:
Robert Widmann
2024-02-08 03:27:29 -07:00
committed by Robert Widmann
parent 6da33336d3
commit ea49d13a12
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AST/ASTDemangler.cpp
View File

@@ -1032,8 +1032,12 @@ ModuleDecl *
ASTBuilder::findModule(NodePointer node) { ASTBuilder::findModule(NodePointer node) {
assert(node->getKind() == Demangle::Node::Kind::Module); 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 && Ctx.MainModule->getABIName().is(moduleName))
return Ctx.MainModule; if (!Ctx.MainModule->getABIName().is(STDLIB_NAME))
return Ctx.MainModule;
return Ctx.getModuleByName(moduleName); return Ctx.getModuleByName(moduleName);
} }

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

@@ -3,16 +3,21 @@
import Swift import Swift
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
public protocol Aspect { public protocol Aspect {
associatedtype Orientation : Bottom.Aspect associatedtype Orientation : Bottom.Aspect
var orientation: Self.Orientation { get } var orientation: Self.Orientation { get }
} }
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
public struct Parameter { public struct Parameter {
} }
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
public struct ReferencesTop { public struct ReferencesTop {
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
public func orientation(of parameter: Bottom.Parameter) -> some Bottom.Aspect 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) __ public typealias Orientation = @_opaqueReturnTypeOf("$s3Top13ReferencesTopV11orientation2ofQrAA9ParameterV_tF", 0) __
} }

3
test/ModuleInterface/Inputs/opaque-type-abi-name/test.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
/Users/rwidmann/SwiftInternal/build/Ninja-Release/swift-macosx-arm64/bin/swift-frontend -sdk $(xcrun --show-sdk-path) -compile-module-from-interface -module-name Bottom -o Bottom.swiftmodule Bottom.swiftinterface -verify