Skip to content

LTO: Stop storing string triple #157991

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
Sep 11, 2025
Merged

LTO: Stop storing string triple #157991

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
c6e525e
LTO: Stop storing string triple
arsenm Sep 11, 2025
3bc7103
Update LTOCodeGenerator.cpp
arsenm Sep 11, 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
1 change: 0 additions & 1 deletion llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ struct LTOCodeGenerator {
std::string FeatureStr;
std::string NativeObjectPath;
const Target *MArch = nullptr;
std::string TripleStr;
lto_diagnostic_handler_t DiagHandler = nullptr;
void *DiagContext = nullptr;
bool ShouldInternalize = EnableLTOInternalization;
Expand Down
16 changes: 6 additions & 10 deletions llvm/lib/LTO/LTOCodeGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,16 +375,12 @@ bool LTOCodeGenerator::determineTarget() {
if (TargetMach)
return true;

TripleStr = MergedModule->getTargetTriple().str();
if (TripleStr.empty()) {
TripleStr = sys::getDefaultTargetTriple();
MergedModule->setTargetTriple(Triple(TripleStr));
}
llvm::Triple Triple(TripleStr);
if (MergedModule->getTargetTriple().empty())
MergedModule->setTargetTriple(Triple(sys::getDefaultTargetTriple()));

// create target machine from info for merged modules
std::string ErrMsg;
MArch = TargetRegistry::lookupTarget(Triple, ErrMsg);
MArch = TargetRegistry::lookupTarget(MergedModule->getTargetTriple(), ErrMsg);
if (!MArch) {
emitError(ErrMsg);
return false;
Expand All @@ -393,10 +389,10 @@ bool LTOCodeGenerator::determineTarget() {
// Construct LTOModule, hand over ownership of module and target. Use MAttr as
// the default set of features.
SubtargetFeatures Features(join(Config.MAttrs, ""));
Features.getDefaultSubtargetFeatures(Triple);
Features.getDefaultSubtargetFeatures(MergedModule->getTargetTriple());
FeatureStr = Features.getString();
if (Config.CPU.empty())
Config.CPU = lto::getThinLTODefaultCPU(Triple);
Config.CPU = lto::getThinLTODefaultCPU(MergedModule->getTargetTriple());

// If data-sections is not explicitly set or unset, set data-sections by
// default to match the behaviour of lld and gold plugin.
Expand All @@ -412,7 +408,7 @@ bool LTOCodeGenerator::determineTarget() {
std::unique_ptr<TargetMachine> LTOCodeGenerator::createTargetMachine() {
assert(MArch && "MArch is not set!");
return std::unique_ptr<TargetMachine>(MArch->createTargetMachine(
Triple(TripleStr), Config.CPU, FeatureStr, Config.Options,
MergedModule->getTargetTriple(), Config.CPU, FeatureStr, Config.Options,
Config.RelocModel, std::nullopt, Config.CGOptLevel));
}

Expand Down