[llvm] CodeView: Move MCCVDefRangeFragment storage to MCContext/MCFragment. NFC (PR #146462)
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 30 21:04:37 PDT 2025
https://github.com/MaskRay created https://github.com/llvm/llvm-project/pull/146462
so that ~MCCVInlineLineTableFragment will become trivial when we
make ~MCEncodedFragment trivial (#146307).
>From 4f352568597b2e40ed4f3abade83d81d956c4246 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Sun, 29 Jun 2025 18:56:02 -0700
Subject: [PATCH] CodeView: Move MCCVDefRangeFragment storage to
MCContext/MCFragment. NFC
so that ~MCCVInlineLineTableFragment will become trivial when we
make ~MCEncodedFragment trivial (#146307).
---
llvm/include/llvm/MC/MCCodeView.h | 5 +++++
llvm/include/llvm/MC/MCSection.h | 6 +++---
llvm/lib/MC/MCCodeView.cpp | 7 +++++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/llvm/include/llvm/MC/MCCodeView.h b/llvm/include/llvm/MC/MCCodeView.h
index 2a57e04b2c88c..88f84a2462841 100644
--- a/llvm/include/llvm/MC/MCCodeView.h
+++ b/llvm/include/llvm/MC/MCCodeView.h
@@ -18,6 +18,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
+#include <deque>
#include <map>
#include <vector>
@@ -268,6 +269,10 @@ class CodeViewContext {
/// Indicate whether we have already laid out the checksum table addresses or
/// not.
bool ChecksumOffsetsAssigned = false;
+
+ /// Append-only storage of MCCVDefRangeFragment::Ranges.
+ std::deque<SmallVector<std::pair<const MCSymbol *, const MCSymbol *>, 0>>
+ DefRangeStorage;
};
} // end namespace llvm
diff --git a/llvm/include/llvm/MC/MCSection.h b/llvm/include/llvm/MC/MCSection.h
index d85a5893496f3..7451ed6035471 100644
--- a/llvm/include/llvm/MC/MCSection.h
+++ b/llvm/include/llvm/MC/MCSection.h
@@ -675,8 +675,8 @@ class MCCVInlineLineTableFragment : public MCFragment {
/// Fragment representing the .cv_def_range directive.
class MCCVDefRangeFragment : public MCEncodedFragmentWithFixups<32, 4> {
- SmallVector<std::pair<const MCSymbol *, const MCSymbol *>, 2> Ranges;
- SmallString<32> FixedSizePortion;
+ ArrayRef<std::pair<const MCSymbol *, const MCSymbol *>> Ranges;
+ StringRef FixedSizePortion;
/// CodeViewContext has the real knowledge about this format, so let it access
/// our members.
@@ -693,7 +693,7 @@ class MCCVDefRangeFragment : public MCEncodedFragmentWithFixups<32, 4> {
return Ranges;
}
- StringRef getFixedSizePortion() const { return FixedSizePortion.str(); }
+ StringRef getFixedSizePortion() const { return FixedSizePortion; }
static bool classof(const MCFragment *F) {
return F->getKind() == MCFragment::FT_CVDefRange;
diff --git a/llvm/lib/MC/MCCodeView.cpp b/llvm/lib/MC/MCCodeView.cpp
index 1407bc52e1c46..e8f04271e84ce 100644
--- a/llvm/lib/MC/MCCodeView.cpp
+++ b/llvm/lib/MC/MCCodeView.cpp
@@ -442,10 +442,13 @@ MCFragment *CodeViewContext::emitDefRange(
MCObjectStreamer &OS,
ArrayRef<std::pair<const MCSymbol *, const MCSymbol *>> Ranges,
StringRef FixedSizePortion) {
+ // Store `Ranges` and `FixedSizePortion` in the context, returning references,
+ // as MCCVDefRangeFragment does not own these objects.
+ FixedSizePortion = MCCtx->allocateString(FixedSizePortion);
+ auto &Saved = DefRangeStorage.emplace_back(Ranges.begin(), Ranges.end());
// Create and insert a fragment into the current section that will be encoded
// later.
- auto *F =
- MCCtx->allocFragment<MCCVDefRangeFragment>(Ranges, FixedSizePortion);
+ auto *F = MCCtx->allocFragment<MCCVDefRangeFragment>(Saved, FixedSizePortion);
OS.insert(F);
return F;
}
More information about the llvm-commits
mailing list