Merge pull request #8910 from apple/instrumention-runtime-activate

JDevlieghere · web-flow · commit 5f87d6ee2f8c · 2024-06-18T14:06:00.000-07:00
[LLDB] Don't cache module sp when Activate() fails. (llvm#95586)
diff --git a/lldb/source/Target/InstrumentationRuntime.cpp b/lldb/source/Target/InstrumentationRuntime.cpp
@@ -60,6 +60,8 @@ void InstrumentationRuntime::ModulesDidLoad(
       if (CheckIfRuntimeIsValid(module_sp)) {
         SetRuntimeModuleSP(module_sp);
         Activate();
+        if (!IsActive())
+          SetRuntimeModuleSP({}); // Don't cache module if activation failed.
         return false; // Stop iterating, we're done.
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ void InstrumentationRuntime::ModulesDidLoad(`
`60`	`60`	`if (CheckIfRuntimeIsValid(module_sp)) {`
`61`	`61`	`SetRuntimeModuleSP(module_sp);`
`62`	`62`	`Activate();`
	`63`	`+ if (!IsActive())`
	`64`	`+ SetRuntimeModuleSP({}); // Don't cache module if activation failed.`
`63`	`65`	`return false; // Stop iterating, we're done.`
`64`	`66`	`}`
`65`	`67`	`}`