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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52748 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index e4380ea..408704d 100644
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -14,6 +14,7 @@
#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"
@@ -115,8 +116,10 @@
if (ConstantInt *CUI = dyn_cast<ConstantInt>(CS->getOperand(1)))
Version = CUI->getZExtValue();
- BaseName = CS->getOperand(3)->getStringValue();
- Directory = CS->getOperand(4)->getStringValue();
+ if (!GetConstantStringInfo(CS->getOperand(3), BaseName))
+ BaseName = "";
+ if (!GetConstantStringInfo(CS->getOperand(4), Directory))
+ Directory = "";
}
}
@@ -156,7 +159,8 @@
SourceFile = &PI.getSourceFile(GV);
// Entry #2 is the function name.
- Name = CS->getOperand(2)->getStringValue();
+ if (!GetConstantStringInfo(CS->getOperand(2), Name))
+ Name = "";
}
}