diff options
author | Jim Laskey <jlaskey@mac.com> | 2006-03-08 18:11:07 +0000 |
---|---|---|
committer | Jim Laskey <jlaskey@mac.com> | 2006-03-08 18:11:07 +0000 |
commit | 21b6c9d6477c8df3f884c3f1ebeaaa44dd53aafe (patch) | |
tree | 6a270d094423a48490d9b95eb38e8b7429e38bc9 /lib | |
parent | 1ffd41ab9927be0fb2d2ddaf1fed6c85f00140d9 (diff) | |
download | external_llvm-21b6c9d6477c8df3f884c3f1ebeaaa44dd53aafe.zip external_llvm-21b6c9d6477c8df3f884c3f1ebeaaa44dd53aafe.tar.gz external_llvm-21b6c9d6477c8df3f884c3f1ebeaaa44dd53aafe.tar.bz2 |
Get rid of the multiple copies of getStringValue. Now a Constant:: method.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26616 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CodeGen/DwarfWriter.cpp | 1 | ||||
-rw-r--r-- | lib/CodeGen/MachineDebugInfo.cpp | 43 | ||||
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 20 | ||||
-rw-r--r-- | lib/Debugger/ProgramInfo.cpp | 45 | ||||
-rw-r--r-- | lib/VMCore/Constants.cpp | 40 |
5 files changed, 46 insertions, 103 deletions
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp index 99beaf3..ce82d97 100644 --- a/lib/CodeGen/DwarfWriter.cpp +++ b/lib/CodeGen/DwarfWriter.cpp @@ -1244,7 +1244,6 @@ DIE *DwarfWriter::NewBasicType(DIE *Context, Type *Ty) { /// NewType - Create a new type DIE. /// DIE *DwarfWriter::NewType(DIE *Context, TypeDesc *TyDesc) { - // FIXME - hack to get around NULL types short term. if (!TyDesc) return NewBasicType(Context, Type::IntTy); // FIXME - Should handle other contexts that compile units. diff --git a/lib/CodeGen/MachineDebugInfo.cpp b/lib/CodeGen/MachineDebugInfo.cpp index 45ded8e..e18a243 100644 --- a/lib/CodeGen/MachineDebugInfo.cpp +++ b/lib/CodeGen/MachineDebugInfo.cpp @@ -67,45 +67,6 @@ getGlobalVariablesUsing(Module &M, const std::string &RootName) { return Result; } -/// getStringValue - Turn an LLVM constant pointer that eventually points to a -/// global into a string value. Return an empty string if we can't do it. -/// -static const std::string getStringValue(Value *V, unsigned Offset = 0) { - if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V)) { - if (GV->hasInitializer() && isa<ConstantArray>(GV->getInitializer())) { - ConstantArray *Init = cast<ConstantArray>(GV->getInitializer()); - if (Init->isString()) { - std::string Result = Init->getAsString(); - if (Offset < Result.size()) { - // If we are pointing INTO The string, erase the beginning... - Result.erase(Result.begin(), Result.begin()+Offset); - - // Take off the null terminator, and any string fragments after it. - std::string::size_type NullPos = Result.find_first_of((char)0); - if (NullPos != std::string::npos) - Result.erase(Result.begin()+NullPos, Result.end()); - return Result; - } - } - } - } else if (Constant *C = dyn_cast<Constant>(V)) { - if (GlobalValue *GV = dyn_cast<GlobalValue>(C)) - return getStringValue(GV, Offset); - else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { - if (CE->getOpcode() == Instruction::GetElementPtr) { - // Turn a gep into the specified offset. - if (CE->getNumOperands() == 3 && - cast<Constant>(CE->getOperand(1))->isNullValue() && - isa<ConstantInt>(CE->getOperand(2))) { - return getStringValue(CE->getOperand(0), - Offset+cast<ConstantInt>(CE->getOperand(2))->getRawValue()); - } - } - } - } - return ""; -} - /// isStringValue - Return true if the given value can be coerced to a string. /// static bool isStringValue(Value *V) { @@ -250,7 +211,7 @@ public: } virtual void Apply(std::string &Field) { Constant *C = CI->getOperand(I++); - Field = getStringValue(C); + Field = C->getStringValue(); } virtual void Apply(DebugInfoDesc *&Field) { Constant *C = CI->getOperand(I++); @@ -571,7 +532,7 @@ void AnchorDesc::ApplyToFields(DIVisitor *Visitor) { /// getDescString - Return a string used to compose global names and labels. A /// A global variable name needs to be defined for each debug descriptor that is -/// anchored. NOTE: that each global variable name here also needs to be added +/// anchored. NOTE: that each global variable named here also needs to be added /// to the list of names left external in the internalizer. /// ExternalNames.insert("llvm.dbg.compile_units"); /// ExternalNames.insert("llvm.dbg.global_variables"); diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index b0eae94..58cf185 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -873,24 +873,6 @@ void SelectionDAGLowering::visitAlloca(AllocaInst &I) { CurMBB->getParent()->getFrameInfo()->CreateVariableSizedObject(); } -/// getStringValue - Turn an LLVM constant pointer that eventually points to a -/// global into a string value. Return an empty string if we can't do it. -/// -static std::string getStringValue(GlobalVariable *GV, unsigned Offset = 0) { - if (GV->hasInitializer() && isa<ConstantArray>(GV->getInitializer())) { - ConstantArray *Init = cast<ConstantArray>(GV->getInitializer()); - if (Init->isString()) { - std::string Result = Init->getAsString(); - if (Offset < Result.size()) { - // If we are pointing INTO The string, erase the beginning... - Result.erase(Result.begin(), Result.begin()+Offset); - return Result; - } - } - } - return ""; -} - void SelectionDAGLowering::visitLoad(LoadInst &I) { SDOperand Ptr = getValue(I.getOperand(0)); @@ -1962,7 +1944,7 @@ void SelectionDAGLowering::visitMemIntrinsic(CallInst &I, unsigned Op) { if (G) { GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal()); if (GV) { - Str = getStringValue(GV); + Str = GV->getStringValue(); if (!Str.empty()) { CopyFromStr = true; SrcOff += SrcDelta; diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp index b55606b..ebca794 100644 --- a/lib/Debugger/ProgramInfo.cpp +++ b/lib/Debugger/ProgramInfo.cpp @@ -38,45 +38,6 @@ static void getGlobalVariablesUsing(Value *V, } } -/// getStringValue - Turn an LLVM constant pointer that eventually points to a -/// global into a string value. Return an empty string if we can't do it. -/// -static std::string getStringValue(Value *V, unsigned Offset = 0) { - if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V)) { - if (GV->hasInitializer() && isa<ConstantArray>(GV->getInitializer())) { - ConstantArray *Init = cast<ConstantArray>(GV->getInitializer()); - if (Init->isString()) { - std::string Result = Init->getAsString(); - if (Offset < Result.size()) { - // If we are pointing INTO The string, erase the beginning... - Result.erase(Result.begin(), Result.begin()+Offset); - - // Take off the null terminator, and any string fragments after it. - std::string::size_type NullPos = Result.find_first_of((char)0); - if (NullPos != std::string::npos) - Result.erase(Result.begin()+NullPos, Result.end()); - return Result; - } - } - } - } else if (Constant *C = dyn_cast<Constant>(V)) { - if (GlobalValue *GV = dyn_cast<GlobalValue>(C)) - return getStringValue(GV, Offset); - else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { - if (CE->getOpcode() == Instruction::GetElementPtr) { - // Turn a gep into the specified offset. - if (CE->getNumOperands() == 3 && - cast<Constant>(CE->getOperand(1))->isNullValue() && - isa<ConstantInt>(CE->getOperand(2))) { - return getStringValue(CE->getOperand(0), - Offset+cast<ConstantInt>(CE->getOperand(2))->getRawValue()); - } - } - } - } - return ""; -} - /// getNextStopPoint - Follow the def-use chains of the specified LLVM value, /// traversing the use chains until we get to a stoppoint. When we do, return /// the source location of the stoppoint. If we don't find a stoppoint, return @@ -158,8 +119,8 @@ SourceFileInfo::SourceFileInfo(const GlobalVariable *Desc, if (ConstantUInt *CUI = dyn_cast<ConstantUInt>(CS->getOperand(1))) Version = CUI->getValue(); - BaseName = getStringValue(CS->getOperand(3)); - Directory = getStringValue(CS->getOperand(4)); + BaseName = CS->getOperand(3)->getStringValue(); + Directory = CS->getOperand(4)->getStringValue(); } } @@ -199,7 +160,7 @@ SourceFunctionInfo::SourceFunctionInfo(ProgramInfo &PI, SourceFile = &PI.getSourceFile(GV); // Entry #2 is the function name. - Name = getStringValue(CS->getOperand(2)); + Name = CS->getOperand(2)->getStringValue(); } } diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index c8a5f35..1beb5bc 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -1712,3 +1712,43 @@ void Constant::clearAllValueMaps() { (*I)->destroyConstantImpl(); Constants.clear(); } + +/// getStringValue - Turn an LLVM constant pointer that eventually points to a +/// global into a string value. Return an empty string if we can't do it. +/// +std::string Constant::getStringValue(unsigned Offset) { + if (GlobalVariable *GV = dyn_cast<GlobalVariable>(this)) { + if (GV->hasInitializer() && isa<ConstantArray>(GV->getInitializer())) { + ConstantArray *Init = cast<ConstantArray>(GV->getInitializer()); + if (Init->isString()) { + std::string Result = Init->getAsString(); + if (Offset < Result.size()) { + // If we are pointing INTO The string, erase the beginning... + Result.erase(Result.begin(), Result.begin()+Offset); + + // Take off the null terminator, and any string fragments after it. + std::string::size_type NullPos = Result.find_first_of((char)0); + if (NullPos != std::string::npos) + Result.erase(Result.begin()+NullPos, Result.end()); + return Result; + } + } + } + } else if (Constant *C = dyn_cast<Constant>(this)) { + if (GlobalValue *GV = dyn_cast<GlobalValue>(C)) + return GV->getStringValue(Offset); + else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { + if (CE->getOpcode() == Instruction::GetElementPtr) { + // Turn a gep into the specified offset. + if (CE->getNumOperands() == 3 && + cast<Constant>(CE->getOperand(1))->isNullValue() && + isa<ConstantInt>(CE->getOperand(2))) { + Offset += cast<ConstantInt>(CE->getOperand(2))->getRawValue(); + return CE->getOperand(0)->getStringValue(Offset); + } + } + } + } + return ""; +} + |