[llvm-commits] [llvm-gcc-4.2] r144652 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-convert.cpp

[Benjamin Kramer]

Author: d0k
Date: Tue Nov 15 12:13:17 2011
New Revision: 144652

URL: http://llvm.org/viewvc/llvm-project?rev=144652&view=rev
Log:
Remove uses of Value::getNameStr from llvm-gcc.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=144652&r1=144651&r2=144652&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Nov 15 12:13:17 2011
@@ -1649,13 +1649,9 @@
   }
 
   if (TheDebugInfo) {
-    std::string Name = GV->getNameStr();
-    const char LPrefix[] = "\01L_OBJC_";
-    const char lPrefix[] = "\01l_OBJC_";
-
     if (flag_objc_abi == -1 || flag_objc_abi == 0 ||
-        (strncmp(Name.c_str(), LPrefix, sizeof(LPrefix) - 1) != 0 &&
-         strncmp(Name.c_str(), lPrefix, sizeof(lPrefix) - 1) != 0))
+        (!GV->getName().startswith("\01L_OBJC_") &&
+         !GV->getName().startswith("\01l_OBJC_")))
       TheDebugInfo->EmitGlobalVariable(GV, decl);
   }
 

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=144652&r1=144651&r2=144652&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Nov 15 12:13:17 2011
@@ -3615,7 +3615,7 @@
 Value *TreeToLLVM::EmitABS_EXPR(tree exp) {
   Value *Op = Emit(TREE_OPERAND(exp, 0), 0);
   if (!Op->getType()->isFloatingPointTy()) {
-    Value *OpN = Builder.CreateNeg(Op, (Op->getNameStr()+"neg").c_str());
+    Value *OpN = Builder.CreateNeg(Op, Op->getName() + "neg");
     ICmpInst::Predicate pred = TYPE_UNSIGNED(TREE_TYPE(TREE_OPERAND(exp, 0))) ?
       ICmpInst::ICMP_UGE : ICmpInst::ICMP_SGE;
     Value *Cmp = Builder.CreateICmp(pred, Op,
@@ -3689,8 +3689,7 @@
               cast<VectorType>(Ty)->getElementType()->isFloatingPointTy())) {
     Op = BitCastToType(Op, getSuitableBitCastIntType(Ty));
   }
-  return BitCastToType(Builder.CreateNot(Op,
-                                         (Op->getNameStr()+"not").c_str()),Ty);
+  return BitCastToType(Builder.CreateNot(Op, Op->getName() + "not", Ty);
 }
 
 Value *TreeToLLVM::EmitTRUTH_NOT_EXPR(tree exp) {
@@ -3698,7 +3697,7 @@
   if (V->getType() != Type::getInt1Ty(Context))
     V = Builder.CreateICmpNE(V,
           Constant::getNullValue(V->getType()), "toBool");
-  V = Builder.CreateNot(V, (V->getNameStr()+"not").c_str());
+  V = Builder.CreateNot(V, V->getName() + "not");
   return CastToUIntType(V, ConvertType(TREE_TYPE(exp)));
 }
 
@@ -3914,7 +3913,7 @@
   Value *RHS = Emit(TREE_OPERAND(exp, 1), 0);
   if (RHS->getType() != LHS->getType())
     RHS = Builder.CreateIntCast(RHS, LHS->getType(), false,
-                                (RHS->getNameStr()+".cast").c_str());
+                                RHS->getName() + ".cast");
 
   return Builder.CreateBinOp((Instruction::BinaryOps)Opc, LHS, RHS);
 }
@@ -3927,13 +3926,12 @@
     Type *Ty =
       IntegerType::get(Context,
                        TYPE_PRECISION(TREE_TYPE (TREE_OPERAND (exp, 0))));
-    In = Builder.CreatePtrToInt(In, Ty,
-                                (In->getNameStr()+".cast").c_str());
+    In = Builder.CreatePtrToInt(In, Ty, In->getName() + ".cast");
   }
 
   if (Amt->getType() != In->getType())
     Amt = Builder.CreateIntCast(Amt, In->getType(), false,
-                                (Amt->getNameStr()+".cast").c_str());
+                                Amt->getName() + ".cast");
 
   Value *TypeSize =
     ConstantInt::get(In->getType(),
@@ -4175,11 +4173,11 @@
     // Calculate |LHS| ...
     Value *MinusLHS = Builder.CreateNeg(LHS);
     Value *AbsLHS = Builder.CreateSelect(LHSIsPositive, LHS, MinusLHS,
-                                         (LHS->getNameStr()+".abs").c_str());
+                                         LHS->getName() + ".abs");
     // ... and |RHS|
     Value *MinusRHS = Builder.CreateNeg(RHS);
     Value *AbsRHS = Builder.CreateSelect(RHSIsPositive, RHS, MinusRHS,
-                                         (RHS->getNameStr()+".abs").c_str());
+                                         RHS->getName() + ".abs");
 
     // Calculate AbsRDiv = (|LHS| + (|RHS| UDiv 2)) UDiv |RHS|.
     Value *HalfAbsRHS = Builder.CreateUDiv(AbsRHS, Two);