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/Debugger | |
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/Debugger')
-rw-r--r-- | lib/Debugger/ProgramInfo.cpp | 45 |
1 files changed, 3 insertions, 42 deletions
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(); } } |