Author: David Peixotto Date: 2025-04-02T17:22:46-07:00 New Revision: b55bab229228218341e2f24fc8529c7aaab51e2f
URL: https://github.com/llvm/llvm-project/commit/b55bab229228218341e2f24fc8529c7aaab51e2f DIFF: https://github.com/llvm/llvm-project/commit/b55bab229228218341e2f24fc8529c7aaab51e2f.diff LOG: [lldb] Fix plugin manager test failure on windows (#134173) This is an attempt to fix a test failure from #133794 when running on windows builds. I suspect we are running into a case where the [ICF](https://learn.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=msvc-170) optimization kicks in and combines the CreateSystemRuntimePlugin* functions into a single address. This means that we cannot uniquely unregister the plugin based on its create function address. The fix is have each create function return a different (bogus) value. Added: Modified: lldb/unittests/Core/PluginManagerTest.cpp Removed: ################################################################################ diff --git a/lldb/unittests/Core/PluginManagerTest.cpp b/lldb/unittests/Core/PluginManagerTest.cpp index ca1003ca9a85a..9b0ce2286d273 100644 --- a/lldb/unittests/Core/PluginManagerTest.cpp +++ b/lldb/unittests/Core/PluginManagerTest.cpp @@ -7,11 +7,21 @@ using namespace lldb; using namespace lldb_private; // Mock system runtime plugin create functions. -SystemRuntime *CreateSystemRuntimePluginA(Process *process) { return nullptr; } +// Make them all return diff erent values to avoid the ICF optimization +// from combining them into the same function. The values returned +// are not valid SystemRuntime pointers, but they are unique and +// sufficient for testing. +SystemRuntime *CreateSystemRuntimePluginA(Process *process) { + return (SystemRuntime *)0x1; +} -SystemRuntime *CreateSystemRuntimePluginB(Process *process) { return nullptr; } +SystemRuntime *CreateSystemRuntimePluginB(Process *process) { + return (SystemRuntime *)0x2; +} -SystemRuntime *CreateSystemRuntimePluginC(Process *process) { return nullptr; } +SystemRuntime *CreateSystemRuntimePluginC(Process *process) { + return (SystemRuntime *)0x3; +} // Test class for testing the PluginManager. // The PluginManager modifies global state when registering new plugins. This @@ -24,6 +34,10 @@ class PluginManagerTest : public testing::Test { // Add mock system runtime plugins for testing. void RegisterMockSystemRuntimePlugins() { + // Make sure the create functions all have diff erent addresses. + ASSERT_NE(CreateSystemRuntimePluginA, CreateSystemRuntimePluginB); + ASSERT_NE(CreateSystemRuntimePluginB, CreateSystemRuntimePluginC); + ASSERT_TRUE(PluginManager::RegisterPlugin("a", "test instance A", CreateSystemRuntimePluginA)); ASSERT_TRUE(PluginManager::RegisterPlugin("b", "test instance B", _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
