[Lldb-commits] [lldb] 9a41f6e - Revert "[lldb] Use just-built libcxx for tests when available"
Felipe de Azevedo Piovezan via lldb-commits
lldb-commits at lists.llvm.org
Thu Sep 8 11:38:30 PDT 2022
Author: Felipe de Azevedo Piovezan
Date: 2022-09-08T14:38:08-04:00
New Revision: 9a41f6e7080e7ca6274a460e9e32ba616fa46249
URL: https://github.com/llvm/llvm-project/commit/9a41f6e7080e7ca6274a460e9e32ba616fa46249
DIFF: https://github.com/llvm/llvm-project/commit/9a41f6e7080e7ca6274a460e9e32ba616fa46249.diff
LOG: Revert "[lldb] Use just-built libcxx for tests when available"
This reverts commit c38eeecbc7d929c9601f2189214a7a90d3982a47.
Added:
Modified:
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
lldb/test/API/commands/expression/fixits/TestFixIts.py
lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
lldb/test/API/lang/objc/exceptions/Makefile
lldb/test/API/macosx/macCatalyst/Makefile
lldb/test/API/python_api/sbmodule/TestSBModule.py
lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
Removed:
################################################################################
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index c0fd5ecd0dc84..937a2ae06fc44 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -387,16 +387,6 @@ endif
#----------------------------------------------------------------------
# C++ standard library options
#----------------------------------------------------------------------
-ifneq ($(and $(USE_LIBSTDCPP), $(USE_LIBCPP)),)
- $(error Libcxx and Libstdc++ cannot be used together)
-endif
-
-ifeq (1, $(USE_SYSTEM_STDLIB))
- ifneq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP)),)
- $(error Cannot use system's standard library and a custom standard library together)
- endif
-endif
-
ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC)))
@@ -425,15 +415,6 @@ ifeq (1,$(USE_LIBCPP))
endif
endif
-# If no explicit request was made, but we have paths to a custom libcxx, use
-# them.
-ifeq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP), $(USE_SYSTEM_STDLIB)),)
- ifneq ($(and $(LIBCPP_INCLUDE_DIR), $(LIBCPP_LIBRARY_DIR)),)
- CXXFLAGS += -nostdlib++ -nostdinc++ -cxx-isystem $(LIBCPP_INCLUDE_DIR)
- LDFLAGS += -L$(LLVM_LIBS_DIR) -Wl,-rpath,$(LIBCPP_LIBRARY_DIR) -lc++
- endif
-endif
-
#----------------------------------------------------------------------
# Additional system libraries
#----------------------------------------------------------------------
diff --git a/lldb/test/API/commands/expression/fixits/TestFixIts.py b/lldb/test/API/commands/expression/fixits/TestFixIts.py
index bcc7e61d5261c..bf4118d1b9d86 100644
--- a/lldb/test/API/commands/expression/fixits/TestFixIts.py
+++ b/lldb/test/API/commands/expression/fixits/TestFixIts.py
@@ -45,7 +45,7 @@ def test_with_target(self):
# Try with one error in a top-level expression.
# The Fix-It changes "ptr.m" to "ptr->m".
- expr = "struct MyTy { int m; }; MyTy x; MyTy *ptr = &x; int m = ptr.m;"
+ expr = "struct X { int m; }; X x; X *ptr = &x; int m = ptr.m;"
value = frame.EvaluateExpression(expr, top_level_options)
# A successfully parsed top-level expression will yield an error
# that there is 'no value'. If a parsing error would have happened we
diff --git a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
index d794f3b127b3a..f9b7219c72a3d 100644
--- a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
@@ -29,3 +29,8 @@ def test(self):
self.expect_expr("std::distance(a.begin(), a.end())", result_value="3")
self.expect_expr("a.front().a", result_type="int", result_value="3")
self.expect_expr("a.begin()->a", result_type="int", result_value="3")
+
+ # FIXME: The value here isn't actually empty.
+ self.expect_expr("a.front()",
+ result_type=value_type,
+ result_children=[ValueCheck()])
diff --git a/lldb/test/API/lang/objc/exceptions/Makefile b/lldb/test/API/lang/objc/exceptions/Makefile
index 355010a867e3a..876340159d9c8 100644
--- a/lldb/test/API/lang/objc/exceptions/Makefile
+++ b/lldb/test/API/lang/objc/exceptions/Makefile
@@ -2,7 +2,7 @@ OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS := -w
-USE_SYSTEM_STDLIB := 1
+
LD_EXTRAS := -framework Foundation
include Makefile.rules
diff --git a/lldb/test/API/macosx/macCatalyst/Makefile b/lldb/test/API/macosx/macCatalyst/Makefile
index 3f084968a2d57..d162c33d774f9 100644
--- a/lldb/test/API/macosx/macCatalyst/Makefile
+++ b/lldb/test/API/macosx/macCatalyst/Makefile
@@ -3,8 +3,6 @@ C_SOURCES := main.c
override TRIPLE := $(ARCH)-apple-ios13.1-macabi
CFLAGS_EXTRAS := -target $(TRIPLE)
-USE_SYSTEM_STDLIB := 1
-
# FIXME: rdar://problem/54986190
# There is a Clang driver change missing on llvm.org.
override CC=xcrun clang
diff --git a/lldb/test/API/python_api/sbmodule/TestSBModule.py b/lldb/test/API/python_api/sbmodule/TestSBModule.py
index 5a6a8e99ebfe3..046c9abddd18c 100644
--- a/lldb/test/API/python_api/sbmodule/TestSBModule.py
+++ b/lldb/test/API/python_api/sbmodule/TestSBModule.py
@@ -47,8 +47,8 @@ def test_module_is_file_backed(self):
process = target.AttachToProcessWithID(self.dbg.GetListener(),
self.background_pid, error)
self.assertTrue(error.Success() and process, PROCESS_IS_VALID)
- main_module = target.FindModule(lldb.SBFileSpec("a.out"))
- self.assertTrue(main_module is not None)
+ main_module = target.GetModuleAtIndex(0)
+ self.assertEqual(main_module.GetFileSpec().GetFilename(), "a.out")
self.assertFalse(main_module.IsFileBacked(),
"The module should not be backed by a file on disk.")
diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
index e666f34bf6068..1f3afb1d404ce 100644
--- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
+++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
@@ -70,7 +70,6 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()):
'SDKROOT': sdkroot.strip(),
'ARCH': arch,
'ARCH_CFLAGS': '-target {} {}'.format(triple, version_min),
- 'USE_SYSTEM_STDLIB': 1,
})
exe_path = os.path.realpath(self.getBuildArtifact(exe_name))
cmd = [
More information about the lldb-commits
mailing list