Skip to content

Commit a230ab2

Browse files
committed
Move GlobalObjects.cpp to SwiftStubs.
It holds the empty array object used by the array implementation, and isn't needed by the core runtime.
1 parent 1adf753 commit a230ab2

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ add_swift_library(swiftRuntime IS_STDLIB IS_STDLIB_CORE
5959
Enum.cpp
6060
ErrorObject.cpp
6161
Errors.cpp
62-
GlobalObjects.cpp
6362
Heap.cpp
6463
HeapObject.cpp
6564
KnownMetadata.cpp

stdlib/public/stubs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
88
endif()
99

1010
add_swift_library(swiftStdlibStubs IS_STDLIB IS_STDLIB_CORE
11+
GlobalObjects.cpp
1112
LibcShims.cpp
1213
Stubs.cpp
1314
${swift_stubs_objc_sources}

stdlib/public/runtime/GlobalObjects.cpp renamed to stdlib/public/stubs/GlobalObjects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extern "C" ClassMetadata _TMCs18_EmptyArrayStorage;
2626
extern "C" _SwiftEmptyArrayStorage _swiftEmptyArrayStorage = {
2727
// HeapObject header;
2828
{
29-
&_TMCs18_EmptyArrayStorage, // is-a pointer
29+
&_TMCs18_EmptyArrayStorage, // isa pointer
3030
},
3131

3232
// _SwiftArrayBodyStorage body;

0 commit comments

Comments
 (0)