Skip to content

Commit bb19f0d

Browse files
committed
Add -ftyped-cxx-delete to CLANG_ENABLE_CPLUSPLUS_TYPED_ALLOCATOR_SUPPORT
rdar://150337166
1 parent 0b4a664 commit bb19f0d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Sources/SWBUniversalPlatform/Specs/Clang LLVM 1.0.xcspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2925,12 +2925,12 @@
29252925
DefaultValue = compiler-default;
29262926
CommandLineArgs = {
29272927
compiler-default = ();
2928-
YES = ("-ftyped-cxx-new-delete");
2929-
NO = ("-fno-typed-cxx-new-delete");
2928+
YES = ("-ftyped-cxx-new-delete", "-ftyped-cxx-delete");
2929+
NO = ("-fno-typed-cxx-new-delete", "-fno-typed-cxx-delete");
29302930
};
29312931
AdditionalLinkerArgs = {
29322932
compiler-default = ();
2933-
YES = ("-ftyped-cxx-new-delete");
2933+
YES = ("-ftyped-cxx-new-delete", "-ftyped-cxx-delete");
29342934
NO = ();
29352935
};
29362936
},

Tests/SWBTaskConstructionTests/TaskConstructionTests.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8478,12 +8478,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
84788478
}
84798479
} else if let val = overrides[typedMemoryOperationsCXX] {
84808480
if val == "YES" {
8481-
task.checkCommandLineContains(["-ftyped-cxx-new-delete"])
8481+
task.checkCommandLineContains(["-ftyped-cxx-new-delete", "-ftyped-cxx-delete"])
84828482
} else if val == "NO" {
8483-
task.checkCommandLineContains(["-fno-typed-cxx-new-delete"])
8483+
task.checkCommandLineContains(["-fno-typed-cxx-new-delete", "-fno-typed-cxx-delete"])
84848484
} else if val == "compiler-default" {
84858485
task.checkCommandLineDoesNotContain("-ftyped-cxx-new-delete")
8486+
task.checkCommandLineDoesNotContain("-ftyped-cxx-delete")
84868487
task.checkCommandLineDoesNotContain("-fno-typed-cxx-new-delete")
8488+
task.checkCommandLineDoesNotContain("-fno-typed-cxx-delete")
84878489
}
84888490
}
84898491
}
@@ -8501,6 +8503,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
85018503
await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
85028504
results.checkTarget("AppTarget") { target -> Void in
85038505
results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
8506+
if let val = override[typedMemoryOperationsCXX], val == "YES" {
8507+
results.checkTask(.matchTarget(target), .matchRuleType("Ld"), body: {task in
8508+
task.checkCommandLineContains(["-ftyped-cxx-new-delete", "-ftyped-cxx-delete"])
8509+
})
8510+
}
85048511
}
85058512
}
85068513
}

0 commit comments

Comments
 (0)