Automerge: Triple: Remove workaround for gcc 4.0.3 (#145660)

arsenm · github-actions[bot] · commit 8bde594da8b8 · 2025-06-25T15:14:57.000Z
Use the Twine version instead of manually building a string
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
@@ -1633,14 +1633,7 @@ void Triple::setObjectFormat(ObjectFormatType Kind) {
 }
 
 void Triple::setArchName(StringRef Str) {
-  // Work around a miscompilation bug for Twines in gcc 4.0.3.
-  SmallString<64> Triple;
-  Triple += Str;
-  Triple += "-";
-  Triple += getVendorName();
-  Triple += "-";
-  Triple += getOSAndEnvironmentName();
-  setTriple(Triple);
+  setTriple(Str + "-" + getVendorName() + "-" + getOSAndEnvironmentName());
 }
 
 void Triple::setVendorName(StringRef Str) {

Original file line number	Diff line number	Diff line change
`@@ -1633,14 +1633,7 @@ void Triple::setObjectFormat(ObjectFormatType Kind) {`
`1633`	`1633`	`}`
`1634`	`1634`
`1635`	`1635`	`void Triple::setArchName(StringRef Str) {`
`1636`		`- // Work around a miscompilation bug for Twines in gcc 4.0.3.`
`1637`		`- SmallString<64> Triple;`
`1638`		`- Triple += Str;`
`1639`		`- Triple += "-";`
`1640`		`- Triple += getVendorName();`
`1641`		`- Triple += "-";`
`1642`		`- Triple += getOSAndEnvironmentName();`
`1643`		`- setTriple(Triple);`
	`1636`	`+ setTriple(Str + "-" + getVendorName() + "-" + getOSAndEnvironmentName());`
`1644`	`1637`	`}`
`1645`	`1638`
`1646`	`1639`	`void Triple::setVendorName(StringRef Str) {`