diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py | 1 | ||||
| -rw-r--r-- | lldb/source/Target/Target.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py index 23749160dbd..359846c314f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py @@ -16,6 +16,7 @@ class ChangedInferiorTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) @skipIf(hostoslist=["windows"]) + @no_debug_info_test def test_inferior_crashing(self): """Test lldb reloads the inferior after it was changed during the session.""" self.build() diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index b7f2f93a600..9d6ebb088f1 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -2838,10 +2838,10 @@ Target::Install (ProcessLaunchInfo *launch_info) const size_t num_images = modules.GetSize(); for (size_t idx = 0; idx < num_images; ++idx) { - const bool is_main_executable = idx == 0; ModuleSP module_sp(modules.GetModuleAtIndex(idx)); if (module_sp) { + const bool is_main_executable = module_sp == GetExecutableModule(); FileSpec local_file (module_sp->GetFileSpec()); if (local_file) { |
