Fix usage of string when StringRef was needed

Also adding a variable to the test, so release bots match %1.
This should also calm the gdb buildbot.

.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@209171 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 4822769f39278512692900077c5e92244b2bbf94..2025f39355ec8cfdbec30b1a1ee06582e54dff1b 100644 (file)
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1780,7 +1780,9 @@ static LValue EmitGlobalNamedRegister(const VarDecl *VD,
                                       CharUnits Alignment) {
   AsmLabelAttr *Asm = VD->getAttr<AsmLabelAttr>();
   llvm::Twine Name("llvm.named.register."+Asm->getLabel());
-  llvm::NamedMDNode *M = CGM.getModule().getOrInsertNamedMetadata(Name.str());
+  SmallString<256> DummyVec;
+  llvm::NamedMDNode *M =
+    CGM.getModule().getOrInsertNamedMetadata(Name.toStringRef(DummyVec));
   if (M->getNumOperands() == 0) {
     llvm::MDString *Str = llvm::MDString::get(CGM.getLLVMContext(),
                                               Asm->getLabel());

diff --git a/test/CodeGen/named_reg_global.c b/test/CodeGen/named_reg_global.c
index 0a4646f7bdb0ea3829ef8b33891e1d04a72c0ec3..38b1828fc5e7c245ebdcb9b0b73e9c85d4f83d54 100644 (file)
--- a/test/CodeGen/named_reg_global.c
+++ b/test/CodeGen/named_reg_global.c
@@ -13,8 +13,8 @@ unsigned long get_stack_pointer_addr() {
 }
 // CHECK: declare{{.*}} i[[bits]] @llvm.read_register.i[[bits]](metadata)
 
-// CHECK: define{{.*}} void @set_stack_pointer_addr(i[[bits]] %addr) #0 {
-// CHECK: [[sto:%[0-9]+]] = load i[[bits]]* %addr
+// CHECK: define{{.*}} void @set_stack_pointer_addr(i[[bits]] %[[addr:[0-9a-z]+]]) #0 {
+// CHECK: [[sto:%[0-9]+]] = load i[[bits]]* %[[addr]]
 // CHECK: call void @llvm.write_register.i[[bits]](metadata !0, i[[bits]] [[sto]])
 // CHECK: ret void
 void set_stack_pointer_addr(unsigned long addr) {