Skip to content

Commit 88e62d7

Browse files
authored
Merge pull request #68134 from compnerd/fragility
Cxx: mark as fragile
2 parents 93855d6 + dff40e9 commit 88e62d7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
1111
list(APPEND SWIFT_CXX_DEPS copy-legacy-layouts)
1212
endif()
1313

14-
add_swift_target_library(swiftCxx ${SWIFT_CXX_LIBRARY_KIND} NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY
14+
add_swift_target_library(swiftCxx ${SWIFT_CXX_LIBRARY_KIND} NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS_FRAGILE
1515
CxxConvertibleToCollection.swift
1616
CxxDictionary.swift
1717
CxxPair.swift

test/Interop/Cxx/class/constructors-copy-irgen-macosx.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Target-specific tests for C++ copy constructor code generation.
22

3-
// RUN: %swift -module-name MySwift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info -Xcc -fignore-exceptions | %FileCheck %s -check-prefix=ITANIUM_X64
3+
// RUN: %swift -module-name MySwift -target x86_64-apple-macosx10.13 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info -Xcc -fignore-exceptions | %FileCheck %s -check-prefix=ITANIUM_X64
44

55
// REQUIRES: OS=macosx
66
// REQUIRES: CPU=x86_64

test/Interop/Cxx/class/constructors-irgen-macosx.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Target-specific tests for C++ constructor call code generation.
22

3-
// RUN: %swift -module-name MySwift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info -Xcc -fignore-exceptions | %FileCheck %s -check-prefix=ITANIUM_X64
3+
// RUN: %swift -module-name MySwift -target x86_64-apple-macosx10.13 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info -Xcc -fignore-exceptions | %FileCheck %s -check-prefix=ITANIUM_X64
44

55
// REQUIRES: OS=macosx
66
// REQUIRES: CPU=x86_64

validation-test/SIL/verify_all_overlays.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
continue
2929
# Skip the C++ standard library overlay because it's not yet shipped
3030
# in any released SDK.
31-
if module_name == "CxxStdlib":
31+
if module_name in ("Cxx", "CxxStdlib"):
3232
continue
3333
# TODO(TF-1229): Fix the "_Differentiation" module.
3434
if module_name == "_Differentiation":

0 commit comments

Comments
 (0)