[CFI] Refactor CfiFunctionIndex to externalize GUID calculation#201635
Merged
mtrofin merged 1 commit intoJun 4, 2026
Conversation
Member
Author
How to use the Graphite Merge QueueAdd the label FP Bundles to this PR to add it to the merge queue. You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
llvmorg-github-actions
Bot
added
LTO
|
@llvm/pr-subscribers-llvm-ir @llvm/pr-subscribers-lto Author: Mircea Trofin (mtrofin) Changes13 Files Affected:
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndex.h b/llvm/include/llvm/IR/ModuleSummaryIndex.h
index e3905ac107539..0eaca276c48d2 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndex.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndex.h
@@ -18,11 +18,13 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/StringSet.h"
#include "llvm/ADT/iterator_range.h"
#include "llvm/IR/ConstantRange.h"
#include "llvm/IR/GlobalValue.h"
@@ -1317,72 +1319,77 @@ struct TypeIdSummary {
std::map<uint64_t, WholeProgramDevirtResolution> WPDRes;
};
+/// Encapsulate the names of CFI target functions. It interfaces with ThinLTO to
+/// determine efficiently which of the names need to be exported for a
+/// particular module.
class CfiFunctionIndex {
- DenseMap<GlobalValue::GUID, std::set<std::string, std::less<>>> Index;
- using IndexIterator =
- DenseMap<GlobalValue::GUID,
- std::set<std::string, std::less<>>>::const_iterator;
- using NestedIterator = std::set<std::string, std::less<>>::const_iterator;
+ // `Names` is the authoritative source of data. `ThinLTOToNamesIndex` is there
+ // just to efficiently retrieve which names in this index need exporting for
+ // a particular module index. We cannot guarantee the ThinLTO GUIDs are
+ // collision - free, so we associate a collection to a guid. Functions with
+ // the same name may have different GUIDs, too. So we index a list of names
+ // with the same GUID under that GUID key. We don't need the reverse because
+ // the queries from ThinLTO use GUIDs as key.
+ // Note that StringSet rehashing doesn't move keys, so we can safely store the
+ // StringRef value inserted in `Names` in ThinLTOToNamesIndex, and avoid
+ // copies.
+ // Design note: we could do away with Names and use ThinLTOToNamesIndex as
+ // index and data source, but opted against, for a small heap penalty, to
+ // avoid confusion wrt the role GUIDs play in this case: they are an artifact
+ // of the need to interface with ThinLTO, not otherwise necessary to CFI.
+ StringSet<> Names;
+
+ using InternalIndexGroup = SetVector<StringRef>;
+ DenseMap<GlobalValue::GUID, InternalIndexGroup> ThinLTOToNamesIndex;
+
+ using NestedIterator = InternalIndexGroup::const_iterator;
public:
- // Iterates keys of the DenseMap.
- class GUIDIterator : public iterator_adaptor_base<GUIDIterator, IndexIterator,
- std::forward_iterator_tag,
- GlobalValue::GUID> {
- using base = GUIDIterator::iterator_adaptor_base;
-
- public:
- GUIDIterator() = default;
- explicit GUIDIterator(IndexIterator I) : base(I) {}
-
- GlobalValue::GUID operator*() const { return this->wrapped()->first; }
- };
-
CfiFunctionIndex() = default;
- template <typename It> CfiFunctionIndex(It B, It E) {
- for (; B != E; ++B)
- emplace(*B);
- }
-
- std::vector<StringRef> symbols() const {
- std::vector<StringRef> Symbols;
- for (auto &[GUID, Syms] : Index) {
- (void)GUID;
- llvm::append_range(Symbols, Syms);
- }
+ CfiFunctionIndex(const CfiFunctionIndex &) = delete;
+ CfiFunctionIndex(CfiFunctionIndex &&) = default;
+
+ /// API used for serialization, e.g. YAML.
+ std::vector<std::pair<StringRef, GlobalValue::GUID>>
+ getSortedSymbols() const {
+ std::vector<std::pair<StringRef, GlobalValue::GUID>> Symbols;
+ for (auto &[GUID, Names] : ThinLTOToNamesIndex)
+ for (auto Name : Names)
+ Symbols.emplace_back(Name, GUID);
+ llvm::sort(Symbols);
return Symbols;
}
- GUIDIterator guid_begin() const { return GUIDIterator(Index.begin()); }
- GUIDIterator guid_end() const { return GUIDIterator(Index.end()); }
- iterator_range<GUIDIterator> guids() const {
- return make_range(guid_begin(), guid_end());
+ /// get the set of GUIDs that should also be exported because they are the
+ /// GUIDs of the cfi functions encapsulated here.
+ auto getExportedThinLTOGUIDs() const {
+ return map_range(ThinLTOToNamesIndex, [](auto I) { return I.first; });
}
- iterator_range<NestedIterator> forGuid(GlobalValue::GUID GUID) const {
- auto I = Index.find(GUID);
- if (I == Index.end())
+ /// get the name(s) associated with a given ThinLTO GUID. This enables
+ /// efficient identification of the subset of names that should be included in
+ /// a module summary.
+ auto getNamesForGUID(GlobalValue::GUID GUID) const {
+ auto I = ThinLTOToNamesIndex.find(GUID);
+ if (I == ThinLTOToNamesIndex.end())
return make_range(NestedIterator{}, NestedIterator{});
return make_range(I->second.begin(), I->second.end());
}
- template <typename... Args> void emplace(Args &&...A) {
- StringRef S(std::forward<Args>(A)...);
- GlobalValue::GUID GUID = GlobalValue::getGUIDAssumingExternalLinkage(
- GlobalValue::dropLLVMManglingEscape(S));
- Index[GUID].emplace(S);
+ /// Add the function name and the GUID that ThinLTO uses for it.
+ void addSymbolWithThinLTOGUID(StringRef Name, GlobalValue::GUID GUID) {
+ auto [Iter, _] = Names.insert(Name);
+ ThinLTOToNamesIndex[GUID].insert(Iter->first());
}
- size_t count(StringRef S) const {
- GlobalValue::GUID GUID = GlobalValue::getGUIDAssumingExternalLinkage(
- GlobalValue::dropLLVMManglingEscape(S));
- auto I = Index.find(GUID);
- if (I == Index.end())
- return 0;
- return I->second.count(S);
+ bool contains(StringRef Name) const {
+ return Names.find(Name) != Names.end();
}
- bool empty() const { return Index.empty(); }
+ bool empty() const {
+ assert(Names.empty() == ThinLTOToNamesIndex.empty());
+ return Names.empty();
+ }
};
/// 160 bits SHA1
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h b/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h
index d374e2eeb24a6..7d50313b948c5 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndexYAML.h
@@ -327,6 +327,24 @@ template <> struct CustomMappingTraits<TypeIdSummaryMapTy> {
}
};
+template <> struct MappingTraits<std::pair<StringRef, GlobalValue::GUID>> {
+ static void mapping(IO &io,
+ std::pair<StringRef, GlobalValue::GUID> &NameAndGUID) {
+ io.mapRequired("Name", NameAndGUID.first);
+ io.mapRequired("GUID", NameAndGUID.second);
+ }
+};
+
+using StringAndGUID = std::pair<llvm::StringRef, llvm::GlobalValue::GUID>;
+
+} // namespace yaml
+} // namespace llvm
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::StringAndGUID)
+
+namespace llvm {
+namespace yaml {
+
template <> struct MappingTraits<ModuleSummaryIndex> {
static void mapping(IO &io, ModuleSummaryIndex& index) {
io.mapOptional("GlobalValueMap", index.GlobalValueMap);
@@ -352,25 +370,24 @@ template <> struct MappingTraits<ModuleSummaryIndex> {
index.WithGlobalValueDeadStripping);
if (io.outputting()) {
- auto CfiFunctionDefs = index.CfiFunctionDefs.symbols();
- llvm::sort(CfiFunctionDefs);
+ auto CfiFunctionDefs = index.CfiFunctionDefs.getSortedSymbols();
io.mapOptional("CfiFunctionDefs", CfiFunctionDefs);
- auto CfiFunctionDecls(index.CfiFunctionDecls.symbols());
- llvm::sort(CfiFunctionDecls);
+ auto CfiFunctionDecls(index.CfiFunctionDecls.getSortedSymbols());
io.mapOptional("CfiFunctionDecls", CfiFunctionDecls);
} else {
- std::vector<std::string> CfiFunctionDefs;
+ std::vector<std::pair<StringRef, GlobalValue::GUID>> CfiFunctionDefs;
io.mapOptional("CfiFunctionDefs", CfiFunctionDefs);
- index.CfiFunctionDefs = {CfiFunctionDefs.begin(), CfiFunctionDefs.end()};
- std::vector<std::string> CfiFunctionDecls;
+ for (auto &[S, G] : CfiFunctionDefs)
+ index.CfiFunctionDefs.addSymbolWithThinLTOGUID(S, G);
+ std::vector<std::pair<StringRef, GlobalValue::GUID>> CfiFunctionDecls;
io.mapOptional("CfiFunctionDecls", CfiFunctionDecls);
- index.CfiFunctionDecls = {CfiFunctionDecls.begin(),
- CfiFunctionDecls.end()};
+ for (auto &[S, G] : CfiFunctionDecls)
+ index.CfiFunctionDecls.addSymbolWithThinLTOGUID(S, G);
}
}
};
-} // End yaml namespace
-} // End llvm namespace
+} // namespace yaml
+} // namespace llvm
#endif
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 3e863f4786e1a..5434fbd5c9871 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -8146,17 +8146,25 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
case bitc::FS_CFI_FUNCTION_DEFS: {
auto &CfiFunctionDefs = TheIndex.cfiFunctionDefs();
- for (unsigned I = 0; I != Record.size(); I += 2)
- CfiFunctionDefs.emplace(Strtab.data() + Record[I],
- static_cast<size_t>(Record[I + 1]));
- break;
+ for (unsigned I = 0; I != Record.size(); I += 2) {
+ StringRef Name(Strtab.data() + Record[I],
+ static_cast<size_t>(Record[I + 1]));
+ GlobalValue::GUID GUID = GlobalValue::getGUIDAssumingExternalLinkage(
+ GlobalValue::dropLLVMManglingEscape(Name));
+ CfiFunctionDefs.addSymbolWithThinLTOGUID(Name, GUID);
+ }
+ break;
}
case bitc::FS_CFI_FUNCTION_DECLS: {
auto &CfiFunctionDecls = TheIndex.cfiFunctionDecls();
- for (unsigned I = 0; I != Record.size(); I += 2)
- CfiFunctionDecls.emplace(Strtab.data() + Record[I],
- static_cast<size_t>(Record[I + 1]));
+ for (unsigned I = 0; I != Record.size(); I += 2) {
+ StringRef Name(Strtab.data() + Record[I],
+ static_cast<size_t>(Record[I + 1]));
+ GlobalValue::GUID GUID = GlobalValue::getGUIDAssumingExternalLinkage(
+ GlobalValue::dropLLVMManglingEscape(Name));
+ CfiFunctionDecls.addSymbolWithThinLTOGUID(Name, GUID);
+ }
break;
}
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index f1ae4aa5fcf30..685d3f5fb67b7 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -5322,8 +5322,8 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
if (CfiIndex.empty())
return;
for (GlobalValue::GUID GUID : DefOrUseGUIDs) {
- auto Defs = CfiIndex.forGuid(GUID);
- llvm::append_range(Functions, Defs);
+ auto Names = CfiIndex.getNamesForGUID(GUID);
+ llvm::append_range(Functions, Names);
}
if (Functions.empty())
return;
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index dbc0b28002e15..6a754f95092bb 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -1585,9 +1585,9 @@ class CGThinBackend : public ThinBackendProc {
OnWrite, ShouldEmitImportsFiles, ThinLTOParallelism),
ShouldEmitIndexFiles(ShouldEmitIndexFiles) {
auto &Defs = CombinedIndex.cfiFunctionDefs();
- CfiFunctionDefs.insert_range(Defs.guids());
+ CfiFunctionDefs.insert_range(Defs.getExportedThinLTOGUIDs());
auto &Decls = CombinedIndex.cfiFunctionDecls();
- CfiFunctionDecls.insert_range(Decls.guids());
+ CfiFunctionDecls.insert_range(Decls.getExportedThinLTOGUIDs());
}
};
@@ -1948,10 +1948,10 @@ class WriteIndexesThinBackend : public ThinBackendProc {
OldPrefix(OldPrefix), NewPrefix(NewPrefix),
NativeObjectPrefix(NativeObjectPrefix),
LinkedObjectsFile(LinkedObjectsFile) {
- auto &Defs = CombinedIndex.cfiFunctionDefs();
- CfiFunctionDefs.insert(Defs.guid_begin(), Defs.guid_end());
- auto &Decls = CombinedIndex.cfiFunctionDecls();
- CfiFunctionDecls.insert(Decls.guid_begin(), Decls.guid_end());
+ auto Defs = CombinedIndex.cfiFunctionDefs().getExportedThinLTOGUIDs();
+ CfiFunctionDefs.insert(Defs.begin(), Defs.end());
+ auto Decls = CombinedIndex.cfiFunctionDecls().getExportedThinLTOGUIDs();
+ CfiFunctionDecls.insert(Decls.begin(), Decls.end());
}
Error start(
@@ -2181,10 +2181,11 @@ Error LTO::runThinLTO(AddStreamFn AddStream, FileCache Cache,
// Any functions referenced by the jump table in the regular LTO object must
// be exported.
- auto &Defs = ThinLTO.CombinedIndex.cfiFunctionDefs();
- ExportedGUIDs.insert(Defs.guid_begin(), Defs.guid_end());
- auto &Decls = ThinLTO.CombinedIndex.cfiFunctionDecls();
- ExportedGUIDs.insert(Decls.guid_begin(), Decls.guid_end());
+ auto Defs = ThinLTO.CombinedIndex.cfiFunctionDefs().getExportedThinLTOGUIDs();
+ ExportedGUIDs.insert(Defs.begin(), Defs.end());
+ auto Decls =
+ ThinLTO.CombinedIndex.cfiFunctionDecls().getExportedThinLTOGUIDs();
+ ExportedGUIDs.insert(Decls.begin(), Decls.end());
auto isExported = [&](StringRef ModuleIdentifier, ValueInfo VI) {
const auto &ExportList = ExportLists.find(ModuleIdentifier);
diff --git a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
index a57e0c59726a3..bc08c73360414 100644
--- a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
+++ b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
@@ -1788,10 +1788,15 @@ void LowerTypeTestsModule::buildBitSetsFromFunctionsNative(
}
if (IsExported) {
+ // TODO: use F->getGUID() once #184065 is relanded.
+ GlobalValue::GUID GUID = GlobalValue::getGUIDAssumingExternalLinkage(
+ GlobalValue::dropLLVMManglingEscape(F->getName()));
if (IsJumpTableCanonical)
- ExportSummary->cfiFunctionDefs().emplace(F->getName());
+ ExportSummary->cfiFunctionDefs().addSymbolWithThinLTOGUID(F->getName(),
+ GUID);
else
- ExportSummary->cfiFunctionDecls().emplace(F->getName());
+ ExportSummary->cfiFunctionDecls().addSymbolWithThinLTOGUID(F->getName(),
+ GUID);
}
if (!IsJumpTableCanonical) {
@@ -2123,9 +2128,9 @@ bool LowerTypeTestsModule::lower() {
// have the same name, but it's not the one we are looking for.
if (F.hasLocalLinkage())
continue;
- if (ImportSummary->cfiFunctionDefs().count(F.getName()))
+ if (ImportSummary->cfiFunctionDefs().contains(F.getName()))
Defs.push_back(&F);
- else if (ImportSummary->cfiFunctionDecls().count(F.getName()))
+ else if (ImportSummary->cfiFunctionDecls().contains(F.getName()))
Decls.push_back(&F);
}
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
index de9385b945524..8b167de77b413 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
@@ -4,6 +4,6 @@ TypeIdMap:
TTRes:
Kind: AllOnes
CfiFunctionDefs:
- - m
-CfiFunctionDecls:
-...
+- Name: m
+ GUID: 2799708793537531759
+CfiFunctionDecls: null
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call.yaml
index 536d20a1129a7..30dff726d5e98 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call.yaml
@@ -4,9 +4,12 @@ TypeIdMap:
TTRes:
Kind: AllOnes
CfiFunctionDefs:
- - internal_default_def
- - internal_hidden_def
- - dsolocal_default_def
+- Name: internal_default_def
+ GUID: 2377677245844927262
+- Name: internal_hidden_def
+ GUID: 12222722662536945321
+- Name: dsolocal_default_def
+ GUID: 11010557671720506420
CfiFunctionDecls:
- - external_decl
-...
+- Name: external_decl
+ GUID: 2828901536631366483
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call1.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call1.yaml
index 37f2e7e47a302..ff9070df3a44f 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call1.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/cfi-direct-call1.yaml
@@ -4,10 +4,14 @@ TypeIdMap:
TTRes:
Kind: AllOnes
CfiFunctionDefs:
- - local_func1
- - local_func2
- - local_func3
+- Name: local_func1
+ GUID: 15974708163032388986
+- Name: local_func2
+ GUID: 10016086976061028907
+- Name: local_func3
+ GUID: 161148068062889559
CfiFunctionDecls:
- - extern_decl
- - extern_weak
-...
+- Name: extern_decl
+ GUID: 15001569853432741044
+- Name: extern_weak
+ GUID: 9772975595203342681
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/import-alias.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/import-alias.yaml
index a5943cb9fd6f7..bce792735de29 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/import-alias.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/import-alias.yaml
@@ -6,6 +6,6 @@ TypeIdMap:
SizeM1BitWidth: 7
WithGlobalValueDeadStripping: false
CfiFunctionDefs:
- - f
-CfiFunctionDecls:
-...
+- Name: f
+ GUID: 14740650423002898831
+CfiFunctionDecls: null
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/import-icall.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/import-icall.yaml
index 558aa9aa73f25..1a13654216e67 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/import-icall.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/import-icall.yaml
@@ -10,11 +10,16 @@ TypeIdMap:
SizeM1BitWidth: 0
WithGlobalValueDeadStripping: false
CfiFunctionDefs:
- - local_a
- - local_b
- - does_not_exist
+- Name: local_a
+ GUID: 16847745505082467832
+- Name: local_b
+ GUID: 3388953113786086079
+- Name: does_not_exist
+ GUID: 3974636296533007648
CfiFunctionDecls:
- - external
- - external_weak
- - local_decl
-...
+- Name: external
+ GUID: 5224464028922159466
+- Name: external_weak
+ GUID: 5227079976482001346
+- Name: local_decl
+ GUID: 6093141505335291027
diff --git a/llvm/test/Transforms/LowerTypeTests/Inputs/import-thinlto-funcs.yaml b/llvm/test/Transforms/LowerTypeTests/Inputs/import-thinlto-funcs.yaml
index 459d45032b0c4..0fc1cfc4b1b12 100644
--- a/llvm/test/Transforms/LowerTypeTests/Inputs/import-thinlto-funcs.yaml
+++ b/llvm/test/Transforms/LowerTypeTests/Inputs/import-thinlto-funcs.yaml
@@ -1,5 +1,6 @@
---
CfiFunctionDefs:
- - f1
- - f2
-...
+- Name: f1
+ GUID: 2072045998141807037
+- Name: f2
+ GUID: 8471399308421654326
diff --git a/llvm/test/Transforms/LowerTypeTests/export-icall.ll b/llvm/test/Transforms/LowerTypeTests/export-icall.ll
index f8adb2d69910f..be8b90260f73f 100644
--- a/llvm/test/Transforms/LowerTypeTests/export-icall.ll
+++ b/llvm/test/Transforms/LowerTypeTests/export-icall.ll
@@ -81,11 +81,17 @@ define void @f3(i32 %x) !type !8 {
; SUMMARY-NEXT: WPDRes:
; SUMMARY: CfiFunctionDefs:
-; SUMMARY-NEXT: - f
-; SUMMARY-NEXT: - f2
-; SUMMARY-NEXT: - g
-; SUMMARY-NEXT: - h
+; SUMMARY-NEXT: - Name: f
+; SUMMARY-NEXT: GUID: 14740650423002898831
+; SUMMARY-NEXT: - Name: f2
+; SUMMARY-NEXT: GUID: 8471399308421654326
+; SUMMARY-NEXT: - Name: g
+; SUMMARY-NEXT: GUID: 13146401226427987378
+; SUMMARY-NEXT: - Name: h
+; SUMMARY-NEXT: GUID: 8124147457056772133
; SUMMARY-NEXT: CfiFunctionDecls:
-; SUMMARY-NEXT: - external
-; SUMMARY-NEXT: - external_weak
+; SUMMARY-NEXT: - Name: external
+; SUMMARY-NEXT: GUID: 5224464028922159466
+; SUMMARY-NEXT: - Name: external_weak
+; SUMMARY-NEXT: GUID: 5227079976482001346
; SUMMARY-NEXT: ...
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
mtrofin
force-pushed
the
users/mtrofin/06-04-_nfc_cfi_refactor_cfifunctionindex_to_externalize_guid_calculation
branch
from
aaae703 to
6ea777e
Compare
vitalybuka
approved these changes
Jun 4, 2026
mtrofin
changed the title
CfiFunctionIndex to externalize GUID calculationCfiFunctionIndex to externalize GUID calculation
mtrofin
deleted the
users/mtrofin/06-04-_nfc_cfi_refactor_cfifunctionindex_to_externalize_guid_calculation
branch
jhpratt
pushed a commit
to jhpratt/rust
that referenced
this pull request
Jun 8, 2026
llvm/llvm-project#201635 removed symbols()
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Jun 8, 2026
Adopt to LLVM 23 CfiFunctionIndex change llvm/llvm-project#201635 removed symbols()
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
2 participants
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.
In preparation for PR #201370 - the goal is to decouple CFI from how ThinLTO computes its GUIDs, and enable PR #184065 (for this RFC).
This PR just changes APIs and the internal implementation of CfiFunctionIndex, the subsequent one (201370) actually propagates GUIDs through metadata. It's almost NFC - the YAML format does change though.