alvinhochun created this revision.
Herald added a project: All.
alvinhochun requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
In `ProcessWindows::OnDebuggerConnected` (triggered from
`CREATE_PROCESS_DEBUG_EVENT`), we should always call
`Target::SetExecutableModule` regardless of whether LLDB has already
preloaded the executable modules. `SetExecutableModule` has the side
effect of clearing the module list of the Target, which help make sure
that module #0 is the executable module and the rest of the modules are
listed according to the DLL load order in the process (technically this
has no real consequences but it seems to make more sense anyway.)
Depends on D134581 <https://reviews.llvm.org/D134581>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D134636
Files:
lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
Index: lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
===================================================================
--- lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
+++ lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
@@ -18,5 +18,7 @@
# CHECK-LABEL: #after
# CHECK-NEXT: target modules list
# CHECK-NEXT: .main.exe
-# CHECK-NEXT: .shlib.dll
+# CHECK-NEXT: ntdll.dll
+# CHECK-NEXT: kernel32.dll
+# CHECK: .shlib.dll
# CHECK-NOT: .shlib.dll
Index: lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
===================================================================
--- lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -653,28 +653,26 @@
LLDB_LOG(log, "Debugger connected to process {0}. Image base = {1:x}",
debugger->GetProcess().GetProcessId(), image_base);
- ModuleSP module = GetTarget().GetExecutableModule();
- if (!module) {
- // During attach, we won't have the executable module, so find it now.
- const DWORD pid = debugger->GetProcess().GetProcessId();
- const std::string file_name = GetProcessExecutableName(pid);
- if (file_name.empty()) {
- return;
- }
-
- FileSpec executable_file(file_name);
- FileSystem::Instance().Resolve(executable_file);
- ModuleSpec module_spec(executable_file);
- Status error;
- module =
- GetTarget().GetOrCreateModule(module_spec, true /* notify */, &error);
- if (!module) {
- return;
- }
+ ModuleSP module;
+ // During attach, we won't have the executable module, so find it now.
+ const DWORD pid = debugger->GetProcess().GetProcessId();
+ const std::string file_name = GetProcessExecutableName(pid);
+ if (file_name.empty()) {
+ return;
+ }
- GetTarget().SetExecutableModule(module, eLoadDependentsNo);
+ FileSpec executable_file(file_name);
+ FileSystem::Instance().Resolve(executable_file);
+ ModuleSpec module_spec(executable_file);
+ Status error;
+ module =
+ GetTarget().GetOrCreateModule(module_spec, true /* notify */, &error);
+ if (!module) {
+ return;
}
+ GetTarget().SetExecutableModule(module, eLoadDependentsNo);
+
if (auto dyld = GetDynamicLoader())
dyld->OnLoadModule(module, ModuleSpec(), image_base);
Index: lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
===================================================================
--- lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
+++ lldb/test/Shell/Target/dependent-modules-nodupe-windows.test
@@ -18,5 +18,7 @@
# CHECK-LABEL: #after
# CHECK-NEXT: target modules list
# CHECK-NEXT: .main.exe
-# CHECK-NEXT: .shlib.dll
+# CHECK-NEXT: ntdll.dll
+# CHECK-NEXT: kernel32.dll
+# CHECK: .shlib.dll
# CHECK-NOT: .shlib.dll
Index: lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
===================================================================
--- lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -653,28 +653,26 @@
LLDB_LOG(log, "Debugger connected to process {0}. Image base = {1:x}",
debugger->GetProcess().GetProcessId(), image_base);
- ModuleSP module = GetTarget().GetExecutableModule();
- if (!module) {
- // During attach, we won't have the executable module, so find it now.
- const DWORD pid = debugger->GetProcess().GetProcessId();
- const std::string file_name = GetProcessExecutableName(pid);
- if (file_name.empty()) {
- return;
- }
-
- FileSpec executable_file(file_name);
- FileSystem::Instance().Resolve(executable_file);
- ModuleSpec module_spec(executable_file);
- Status error;
- module =
- GetTarget().GetOrCreateModule(module_spec, true /* notify */, &error);
- if (!module) {
- return;
- }
+ ModuleSP module;
+ // During attach, we won't have the executable module, so find it now.
+ const DWORD pid = debugger->GetProcess().GetProcessId();
+ const std::string file_name = GetProcessExecutableName(pid);
+ if (file_name.empty()) {
+ return;
+ }
- GetTarget().SetExecutableModule(module, eLoadDependentsNo);
+ FileSpec executable_file(file_name);
+ FileSystem::Instance().Resolve(executable_file);
+ ModuleSpec module_spec(executable_file);
+ Status error;
+ module =
+ GetTarget().GetOrCreateModule(module_spec, true /* notify */, &error);
+ if (!module) {
+ return;
}
+ GetTarget().SetExecutableModule(module, eLoadDependentsNo);
+
if (auto dyld = GetDynamicLoader())
dyld->OnLoadModule(module, ModuleSpec(), image_base);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
