Skip to content

Commit 71a5e39

Browse files
committed
[embedded][Concurrency] Fix missing swift_deletedAsyncMethodError
1 parent c08a1ee commit 71a5e39

File tree

3 files changed

+65
-2
lines changed

3 files changed

+65
-2
lines changed

include/swift/Runtime/RuntimeFunctions.def

+9
Original file line numberDiff line numberDiff line change
@@ -2129,6 +2129,15 @@ FUNCTION(DeletedMethodError, Swift, swift_deletedMethodError, C_CC, AlwaysAvaila
21292129
EFFECT(NoEffect),
21302130
UNKNOWN_MEMEFFECTS)
21312131

2132+
// void swift_deletedAsyncMethodError();
2133+
FUNCTION(DeletedAsyncMethodError, _Concurrency, swift_deletedAsyncMethodError, SwiftAsyncCC,
2134+
ConcurrencyAvailability,
2135+
RETURNS(VoidTy),
2136+
ARGS(),
2137+
ATTRS(NoUnwind),
2138+
EFFECT(Concurrency),
2139+
UNKNOWN_MEMEFFECTS)
2140+
21322141
FUNCTION(AllocError, Swift, swift_allocError, SwiftCC, AlwaysAvailable,
21332142
RETURNS(ErrorPtrTy, OpaquePtrTy),
21342143
ARGS(TypeMetadataPtrTy, WitnessTablePtrTy, OpaquePtrTy, Int1Ty),

lib/IRGen/GenDecl.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -3863,8 +3863,11 @@ IRGenModule::getAddrOfLLVMVariable(LinkEntity entity,
38633863
LinkInfo link = LinkInfo::get(*this, entity, forDefinition);
38643864

38653865
// Clang may have defined the variable already.
3866-
if (auto existing = Module.getNamedGlobal(link.getName()))
3867-
return getElementBitCast(existing, defaultType);
3866+
if (auto existing = Module.getNamedGlobal(link.getName())) {
3867+
auto var = getElementBitCast(existing, defaultType);
3868+
GlobalVars[entity] = var;
3869+
return var;
3870+
}
38683871

38693872
const LazyConstantInitializer *lazyInitializer = nullptr;
38703873
std::optional<ConstantInitBuilder> lazyBuilder;
@@ -4003,6 +4006,7 @@ IRGenModule::getAddrOfLLVMVariableOrGOTEquivalent(LinkEntity entity) {
40034006
getAddrOfLLVMVariable(entity, ConstantInit(), DebugTypeInfo());
40044007

40054008
auto entry = GlobalVars[entity];
4009+
assert(entry);
40064010

40074011
/// Returns a direct reference.
40084012
auto direct = [&]() -> ConstantReference {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-frontend -enable-experimental-feature Embedded -parse-as-library -module-name main %s -emit-ir | %FileCheck --check-prefix=CHECK-IR %s
3+
// RUN: %target-swift-frontend -enable-experimental-feature Embedded -parse-as-library -module-name main %s -c -o %t/a.o
4+
// RUN: %target-clang %t/a.o -o %t/a.out -L%swift_obj_root/lib/swift/embedded/%target-cpu-apple-macos -lswift_Concurrency -lswift_ConcurrencyDefaultExecutor -dead_strip
5+
// RUN: %target-run %t/a.out | %FileCheck %s
6+
7+
// REQUIRES: executable_test
8+
// REQUIRES: swift_in_compiler
9+
// REQUIRES: optimized_stdlib
10+
// REQUIRES: OS=macosx
11+
// REQUIRES: swift_feature_Embedded
12+
13+
import _Concurrency
14+
15+
actor MyActor {
16+
var value: Int = 42
17+
func foo() async {
18+
print("value: \(value)")
19+
}
20+
21+
func thisIsUnused() async {
22+
print("unused")
23+
}
24+
}
25+
26+
@main struct Main {
27+
static func main() async {
28+
let n = MyActor()
29+
await n.foo()
30+
}
31+
}
32+
33+
// CHECK-IR: @swift_deletedAsyncMethodErrorTu =
34+
// CHECK-IR: @"$e4main7MyActorCN" = global <{ ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{
35+
// CHECK-IR-SAME: ptr null,
36+
// CHECK-IR-SAME: ptr @"$e4main7MyActorCfD",
37+
// CHECK-IR-SAME: ptr null,
38+
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
39+
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
40+
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
41+
// CHECK-IR-SAME: ptr @"$e4main7MyActorC3fooyyYaFTu",
42+
// CHECK-IR-SAME: ptr @got.swift_deletedAsyncMethodErrorTu,
43+
// CHECK-IR-SAME: ptr @"$e4main7MyActorCACycfC"
44+
// CHECK-IR-SAME: }>, align 8
45+
46+
// CHECK-IR-NOT: $e4main7MyActorC12thisIsUnusedyyYaF
47+
48+
// CHECK-IR: define swifttailcc void @swift_deletedAsyncMethodError(ptr swiftasync %0)
49+
50+
// CHECK: value: 42

0 commit comments

Comments
 (0)