Skip to content

Commit 7646d73

Browse files
authored
Merge pull request llvm#3515 from apple/Revert-lldb-Disable-swift-create-module-contexts-in-parallel-for-a-few-tests
Revert "[lldb] Disable swift-create-module-contexts-in-parallel for a few tests"
2 parents 9c58adf + 66d1e00 commit 7646d73

File tree

7 files changed

+0
-17
lines changed

7 files changed

+0
-17
lines changed

lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ def setUp(self):
2828

2929
def provider_data_formatter_commands(self):
3030
"""Test that the PythonObjectSyntheticChildProvider helper class works"""
31-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
32-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
3331
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
3432

3533
lldbutil.run_break_set_by_file_and_line(

lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ def test(self):
4545

4646
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4747
% mod_cache)
48-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
49-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
5048
self.build()
5149
target, _, _, _ = lldbutil.run_to_source_breakpoint(self, "break here",
5250
lldb.SBFileSpec('main.swift'),

lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def test(self):
3838
self.runCmd("settings set symbols.use-swift-dwarfimporter false")
3939
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4040
% mod_cache)
41-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
42-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4341
self.build()
4442

4543
target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def test(self):
3838
self.runCmd('settings set symbols.use-swift-dwarfimporter false')
3939
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
4040
% mod_cache)
41-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
42-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4341
self.build()
4442

4543
target, process, _, _ = lldbutil.run_to_source_breakpoint(
@@ -79,9 +77,6 @@ def test_with_dwarfimporter(self):
7977
self.runCmd('settings set symbols.use-swift-dwarfimporter true')
8078
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
8179
% mod_cache)
82-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
83-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
84-
8580
self.build()
8681

8782
target, process, _, _ = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ def test(self):
3737

3838
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
3939
% mod_cache)
40-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
41-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4240
self.build()
4341
target, process, _, foo_breakpoint = lldbutil.run_to_source_breakpoint(
4442
self, 'break here', lldb.SBFileSpec('Foo.swift'),

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ def test(self):
3737

3838
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
3939
% mod_cache)
40-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
41-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
4240
self.build()
4341

4442
target, process, _, bar_breakpoint = lldbutil.run_to_source_breakpoint(

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ def dotest(self, remap):
6060
self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
6161
% mod_cache)
6262
self.runCmd("settings set symbols.use-swift-dwarfimporter false")
63-
# rdar://84688015 SILModule::checkForLeaks can assert when used concurrently.
64-
self.runCmd("settings set target.experimental.swift-create-module-contexts-in-parallel false")
6563

6664
botdir = os.path.realpath(self.getBuildArtifact("buildbot"))
6765
userdir = os.path.realpath(self.getBuildArtifact("user"))

0 commit comments

Comments
 (0)