rebase

Author: aengelke

llvm/lib/MC/MCContext.cpp

@@ -322,12 +322,11 @@ MCSymbol *MCContext::createBlockSymbol(const Twine &Name, bool AlwaysEmit) {
   if (AlwaysEmit)
     return getOrCreateSymbol(MAI->getPrivateLabelPrefix() + Name);
 
-  if (!UseNamesOnTempLabels)
-    return createSymbolImpl(nullptr, /*IsTemporary=*/true);
-
-  SmallString<128> NameSV;
-  raw_svector_ostream(NameSV) << MAI->getPrivateLabelPrefix() << Name;
-  return createSymbol(NameSV, false, /*IsTemporary=*/true);
+  bool IsTemporary = !SaveTempLabels;
+  if (IsTemporary && !UseNamesOnTempLabels)
+    return createSymbolImpl(nullptr, IsTemporary);
+  return createRenamableSymbol(MAI->getPrivateLabelPrefix() << Name,
+                               /*AlwaysAddSuffix=*/false, IsTemporary);
 }
 
 MCSymbol *MCContext::createLinkerPrivateTempSymbol() {