vsk updated this revision to Diff 331695.
vsk added a comment.
- Make the test generic (not Darwin-specific)
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D98879/new/
https://reviews.llvm.org/D98879
Files:
lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
lldb/test/API/functionalities/load_lazy/Makefile
lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
lldb/test/API/functionalities/load_lazy/categories
lldb/test/API/functionalities/load_lazy/main.cpp
lldb/test/API/functionalities/load_lazy/t1.c
lldb/test/API/functionalities/load_lazy/t2_0.c
lldb/test/API/functionalities/load_lazy/t2_1.c
Index: lldb/test/API/functionalities/load_lazy/t2_0.c
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/t2_0.c
@@ -0,0 +1 @@
+void use() {}
Index: lldb/test/API/functionalities/load_lazy/t1.c
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/t1.c
@@ -0,0 +1,3 @@
+extern void use();
+void f1() {}
+void f2() { use(); }
Index: lldb/test/API/functionalities/load_lazy/main.cpp
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/main.cpp
@@ -0,0 +1,3 @@
+int main() {
+ return 0; // break here
+}
Index: lldb/test/API/functionalities/load_lazy/categories
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/categories
@@ -0,0 +1 @@
+basic_process
Index: lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
@@ -0,0 +1,54 @@
+"""
+Test that SBProcess.LoadImageUsingPaths uses RTLD_LAZY
+"""
+
+
+
+import os
+import shutil
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+@skipIfRemote
+@skipIfWindows # The Windows platform doesn't implement DoLoadImage.
+class LoadUsingLazyBind(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ NO_DEBUG_INFO_TESTCASE = True
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+
+ # Invoke the default build rule.
+ self.build()
+
+ self.wd = os.path.realpath(self.getBuildDir())
+
+ self.ext = 'so'
+ if self.platformIsDarwin():
+ self.ext = 'dylib'
+
+ # Overwrite t2_0 with t2_1 to delete the definition of `use`.
+ shutil.copy(os.path.join(self.wd, 'libt2_1.{}'.format(self.ext)),
+ os.path.join(self.wd, 'libt2_0.{}'.format(self.ext)))
+
+ @skipIfRemote
+ @skipIfWindows # The Windows platform doesn't implement DoLoadImage.
+ def test_load_using_lazy_bind(self):
+ """Test that we load using RTLD_LAZY"""
+
+ (target, process, thread, _) = lldbutil.run_to_source_breakpoint(self,
+ "break here",
+ lldb.SBFileSpec("main.cpp"))
+ error = lldb.SBError()
+ lib_spec = lldb.SBFileSpec("libt1.{}".format(self.ext))
+ paths = lldb.SBStringList()
+ paths.AppendString(self.wd)
+ out_spec = lldb.SBFileSpec()
+ token = process.LoadImageUsingPaths(lib_spec, paths, out_spec, error)
+ self.assertNotEqual(token, lldb.LLDB_INVALID_IMAGE_TOKEN, "Got a valid token")
Index: lldb/test/API/functionalities/load_lazy/Makefile
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/load_lazy/Makefile
@@ -0,0 +1,17 @@
+CXX_SOURCES := main.cpp
+
+all: t2_0 t2_1 t1 a.out
+
+include Makefile.rules
+
+t1: t2_0
+ $(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
+ DYLIB_ONLY=YES DYLIB_C_SOURCES=t1.c DYLIB_NAME=t1 LD_EXTRAS="-L. -lt2_0"
+
+t2_0:
+ $(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
+ DYLIB_ONLY=YES DYLIB_C_SOURCES=t2_0.c DYLIB_NAME=t2_0
+
+t2_1:
+ $(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
+ DYLIB_ONLY=YES DYLIB_C_SOURCES=t2_1.c DYLIB_NAME=t2_1
Index: lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
===================================================================
--- lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
+++ lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
@@ -573,6 +573,17 @@
std::unique_ptr<UtilityFunction>
PlatformPOSIX::MakeLoadImageUtilityFunction(ExecutionContext &exe_ctx,
Status &error) {
+ // Use lazy binding so as to not make dlopen()'s success conditional on
+ // forcing every symbol in the library.
+ //
+ // In general, the debugger should allow programs to load & run with
+ // libraries as far as they can, instead of defaulting to being super-picky
+ // about unavailable symbols.
+ //
+ // The value "1" appears to imply lazy binding (RTLD_LAZY) on both Darwin
+ // and other POSIX OSes.
+#define DLOPEN_OPTIONS "1"
+
// Remember to prepend this with the prefix from
// GetLibdlFunctionDeclarations. The returned values are all in
// __lldb_dlopen_result for consistency. The wrapper returns a void * but
@@ -595,7 +606,7 @@
{
// This is the case where the name is the full path:
if (!path_strings) {
- result_ptr->image_ptr = dlopen(name, 2);
+ result_ptr->image_ptr = dlopen(name, )" DLOPEN_OPTIONS R"();
if (result_ptr->image_ptr)
result_ptr->error_str = nullptr;
return nullptr;
@@ -609,7 +620,7 @@
buffer[path_len] = '/';
char *target_ptr = buffer+path_len+1;
memcpy((void *) target_ptr, (void *) name, name_len + 1);
- result_ptr->image_ptr = dlopen(buffer, 2);
+ result_ptr->image_ptr = dlopen(buffer, )" DLOPEN_OPTIONS R"();
if (result_ptr->image_ptr) {
result_ptr->error_str = nullptr;
break;
@@ -620,6 +631,7 @@
return nullptr;
}
)";
+#undef DLOPEN_OPTIONS
static const char *dlopen_wrapper_name = "__lldb_dlopen_wrapper";
Process *process = exe_ctx.GetProcessSP().get();
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
