Skip to content

Commit 74b3221

Browse files
authored
Merge pull request #76108 from rjmansfield/enable-static-init-runtime-test
[Tests] Enable staticMemberInitializedAtRuntime in inline-static-member-var.swift.
2 parents 4987c3b + 6234dd1 commit 74b3221

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

test/Interop/Cxx/static/Inputs/inline-static-member-var.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ inline static int init() { return 42; }
66
class WithInlineStaticMember {
77
public:
88
inline static int staticMember = 12;
9-
//TODO needs C++ stdlib symbols, fix after apple/swift#30914 is merged.
10-
// inline static int staticMemberInitializedAtRuntime = init();
9+
inline static int staticMemberInitializedAtRuntime = init();
1110

1211
static int getStaticMemberFromCxx();
1312
static int *getStaticMemberAddress()

test/Interop/Cxx/static/inline-static-member-var.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ InlineStaticMemberVarTestSuite.test("read-inline-static-member-address") {
1717
WithInlineStaticMember.getStaticMemberAddress())
1818
}
1919

20+
InlineStaticMemberVarTestSuite.test("read-inline-static-member-init-at-runtime") {
21+
expectEqual(42, WithInlineStaticMember.staticMemberInitializedAtRuntime)
22+
}
23+
2024
InlineStaticMemberVarTestSuite.test("write-inline-static-member-from-cxx") {
2125
expectNotEqual(128, WithInlineStaticMember.staticMember)
2226
WithInlineStaticMember.setStaticMemberFromCxx(128)

0 commit comments

Comments
 (0)