diff options
author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-06-29 17:57:03 +0000 |
---|---|---|
committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-06-29 17:57:03 +0000 |
commit | 6d116bc7ced56a820d33b0dd35ee36af8a810eab (patch) | |
tree | b9d056c655001ef42c66a3395d01233d2a499537 /lib/Debugger | |
parent | 28a2b54580b28be10c536def7f49b5599adf3631 (diff) | |
download | external_llvm-6d116bc7ced56a820d33b0dd35ee36af8a810eab.zip external_llvm-6d116bc7ced56a820d33b0dd35ee36af8a810eab.tar.gz external_llvm-6d116bc7ced56a820d33b0dd35ee36af8a810eab.tar.bz2 |
Revert (52748 and friends):
Move GetConstantStringInfo to lib/Analysis. Remove
string output routine from Constant. Update all
callers. Change debug intrinsic api slightly to
accomodate move of routine, these now return values
instead of strings.
This unbreaks llvm-gcc bootstrap.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52884 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Debugger')
-rw-r--r-- | lib/Debugger/ProgramInfo.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp index 408704d..e4380ea 100644 --- a/lib/Debugger/ProgramInfo.cpp +++ b/lib/Debugger/ProgramInfo.cpp @@ -14,7 +14,6 @@ #include "llvm/Debugger/ProgramInfo.h" #include "llvm/Constants.h" -#include "llvm/Analysis/ValueTracking.h" #include "llvm/DerivedTypes.h" #include "llvm/Intrinsics.h" #include "llvm/IntrinsicInst.h" @@ -116,10 +115,8 @@ SourceFileInfo::SourceFileInfo(const GlobalVariable *Desc, if (ConstantInt *CUI = dyn_cast<ConstantInt>(CS->getOperand(1))) Version = CUI->getZExtValue(); - if (!GetConstantStringInfo(CS->getOperand(3), BaseName)) - BaseName = ""; - if (!GetConstantStringInfo(CS->getOperand(4), Directory)) - Directory = ""; + BaseName = CS->getOperand(3)->getStringValue(); + Directory = CS->getOperand(4)->getStringValue(); } } @@ -159,8 +156,7 @@ SourceFunctionInfo::SourceFunctionInfo(ProgramInfo &PI, SourceFile = &PI.getSourceFile(GV); // Entry #2 is the function name. - if (!GetConstantStringInfo(CS->getOperand(2), Name)) - Name = ""; + Name = CS->getOperand(2)->getStringValue(); } } |