Skip to content

[llvm-debuginfo-analyzer][llvmorg-20.1.5] Fix ODR violation in llvm::logicalview::LVObject #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2025
Merged

[llvm-debuginfo-analyzer][llvmorg-20.1.5] Fix ODR violation in llvm::logicalview::LVObject #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b4276
[llvm-debuginfo-analyzer] Make LVObject::dump() non-virtual (NFC)
jalopezg-git Jun 9, 2025
2b0819c
[llvm-debuginfo-analyzer][debuginfologicalview] Fix ODR violation in …
jalopezg-git Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVLine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ class LVLine : public LVElement {

void print(raw_ostream &OS, bool Full = true) const override;
void printExtra(raw_ostream &OS, bool Full = true) const override {}

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

// Class to represent a DWARF line record object.
Expand Down
6 changes: 1 addition & 5 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVLocation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class LVOperation final {
void print(raw_ostream &OS, bool Full = true) const;

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() { print(dbgs()); }
void dump() const { print(dbgs()); }
#endif
};

Expand Down Expand Up @@ -158,10 +158,6 @@ class LVLocation : public LVObject {

void print(raw_ostream &OS, bool Full = true) const override;
void printExtra(raw_ostream &OS, bool Full = true) const override;

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

class LVLocationSymbol final : public LVLocation {
Expand Down
11 changes: 6 additions & 5 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define LLVM_DEBUGINFO_LOGICALVIEW_CORE_LVOBJECT_H

#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/Config/abi-breaking.h"
#include "llvm/DebugInfo/CodeView/CodeView.h"
#include "llvm/DebugInfo/CodeView/TypeIndex.h"
#include "llvm/DebugInfo/LogicalView/Core/LVSupport.h"
Expand Down Expand Up @@ -154,7 +155,7 @@ class LVObject {
// copy constructor to create that object; it is used to print a reference
// to another object and in the case of templates, to print its encoded args.
LVObject(const LVObject &Object) {
#ifndef NDEBUG
#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
incID();
#endif
Properties = Object.Properties;
Expand All @@ -165,7 +166,7 @@ class LVObject {
Parent = Object.Parent;
}

#ifndef NDEBUG
#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
// This is an internal ID used for debugging logical elements. It is used
// for cases where an unique offset within the binary input file is not
// available.
Expand Down Expand Up @@ -193,7 +194,7 @@ class LVObject {

public:
LVObject() {
#ifndef NDEBUG
#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
incID();
#endif
};
Expand Down Expand Up @@ -312,12 +313,12 @@ class LVObject {
virtual void printExtra(raw_ostream &OS, bool Full = true) const {}

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
virtual void dump() const { print(dbgs()); }
void dump() const { print(dbgs()); }
#endif

uint64_t getID() const {
return
#ifndef NDEBUG
#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
ID;
#else
0;
Expand Down
4 changes: 0 additions & 4 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVRange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ class LVRange final : public LVObject {

void print(raw_ostream &OS, bool Full = true) const override;
void printExtra(raw_ostream &OS, bool Full = true) const override {}

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

} // end namespace logicalview
Expand Down
4 changes: 0 additions & 4 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVScope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,6 @@ class LVScope : public LVElement {
void printExtra(raw_ostream &OS, bool Full = true) const override;
virtual void printWarnings(raw_ostream &OS, bool Full = true) const {}
virtual void printMatchedElements(raw_ostream &OS, bool UseMatchedElements) {}

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

// Class to represent a DWARF Union/Structure/Class.
Expand Down
4 changes: 0 additions & 4 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVSymbol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,6 @@ class LVSymbol final : public LVElement {

void print(raw_ostream &OS, bool Full = true) const override;
void printExtra(raw_ostream &OS, bool Full = true) const override;

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

} // end namespace logicalview
Expand Down
4 changes: 0 additions & 4 deletions llvm/include/llvm/DebugInfo/LogicalView/Core/LVType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,6 @@ class LVType : public LVElement {

void print(raw_ostream &OS, bool Full = true) const override;
void printExtra(raw_ostream &OS, bool Full = true) const override;

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void dump() const override { print(dbgs()); }
#endif
};

// Class to represent DW_TAG_typedef_type.
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/DebugInfo/LogicalView/Core/LVObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ using namespace llvm::logicalview;

#define DEBUG_TYPE "Object"

#ifndef NDEBUG
#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
uint64_t LVObject::GID = 0;
#endif

Expand Down