[lldb] Fix plugin manager test failure on windows #134173
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is an attempt to fix a test failure from llvm#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.
|
@llvm/pr-subscribers-lldb Author: David Peixotto (dmpots) ChangesThis 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 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. Full diff: https://github.com/llvm/llvm-project/pull/134173.diff 1 Files Affected:
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 different 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 different 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",
|
|
This is my guess on what is causing the test failures. Can revert this and the original PR if it doesn't work. |
dmpots
added a commit
to dmpots/llvm-project
that referenced
this pull request
Apr 3, 2025
This reverts commit b55bab2.
dmpots
added a commit
to dmpots/llvm-project
that referenced
this pull request
Apr 3, 2025
Revert the below two commits while we investigate the test failures. Revert "[lldb] Fix plugin manager test failure on windows (llvm#134173)" This reverts commit b55bab2. Revert "Add enable/disable api for SystemRuntime plugins (llvm#133794)" This reverts commit 2026873.
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/15362 Here is the relevant piece of the build log for the reference |
Hmm, not sure if this is related. This PR was a test only change so I wouldn't expect these kinds of failures. #134183 has a revert if we need it |
|
The windows bots are now passing on this test so I think it was ICF that was the problem: https://lab.llvm.org/buildbot/#/changes/32645 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 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.