[lldb][x86] Remove GCC 6 workaround#210317
Merged
Merged
Conversation
Added by 3bea730. We now require GCC >= 7.4 so it can be removed. I tested a standalone reproducer with GCC 7.3 and clang 5. Neither have the problem. https://godbolt.org/z/3zKrT9c8s Standalone reproducer: ``` struct Base { Base(int) {} }; struct Derived : virtual Base { #ifdef WORKAROUND Derived(int a): Base(a) {} #endif virtual void g() = 0; }; struct Final : Derived { Final(int n) : Base(n) #ifdef WORKAROUND , Derived(n) #endif {} void g() override {} }; ```
|
@llvm/pr-subscribers-lldb Author: David Spickett (DavidSpickett) ChangesAdded by 3bea730. We now require GCC >= 7.4 so it can be removed. I tested a standalone reproducer with GCC 7.3 and https://godbolt.org/z/3zKrT9c8s Standalone reproducer: Full diff: https://github.com/llvm/llvm-project/pull/210317.diff 2 Files Affected:
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86.cpp
index 67a79566f6f6d..a7af62e89c1dc 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86.cpp
@@ -300,7 +300,6 @@ NativeRegisterContextLinux_x86::NativeRegisterContextLinux_x86(
: NativeRegisterContextRegisterInfo(
native_thread, CreateRegisterInfoInterface(target_arch).release()),
NativeRegisterContextLinux(native_thread),
- NativeRegisterContextDBReg_x86(native_thread),
m_xstate_type(XStateType::Invalid), m_ymm_set(), m_mpx_set(),
m_reg_info(), m_gpr_x86_64() {
// Set up data about ranges of valid registers.
diff --git a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
index 2fdf5000f751c..8a2c1a1dbcbe1 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
@@ -16,12 +16,6 @@ namespace lldb_private {
class NativeRegisterContextDBReg_x86
: public virtual NativeRegisterContextRegisterInfo {
public:
- // NB: This constructor is here only because gcc<=6.5 requires a virtual base
- // class initializer on abstract class (even though it is never used). It can
- // be deleted once we move to gcc>=7.0.
- NativeRegisterContextDBReg_x86(NativeThreadProtocol &thread)
- : NativeRegisterContextRegisterInfo(thread, nullptr) {}
-
Status IsWatchpointHit(uint32_t wp_index, bool &is_hit) override;
Status GetWatchpointHitIndex(uint32_t &wp_index,
|
DavidSpickett
enabled auto-merge (squash)
July 17, 2026 13:08
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
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.
Added by 3bea730.
We now require GCC >= 7.4 so it can be removed.
I tested a standalone reproducer with GCC 7.3 and
clang 5. Neither have the problem.
https://godbolt.org/z/3zKrT9c8s
Standalone reproducer: