From 0582ae99ba75a556d6ff63b254da327d32ba036f Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 13 Mar 2009 04:39:26 +0000 Subject: Oops...I committed too much. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66867 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Debugger/ProgramInfo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/Debugger/ProgramInfo.cpp') diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp index 2bf993ce5a..125ff556dd 100644 --- a/lib/Debugger/ProgramInfo.cpp +++ b/lib/Debugger/ProgramInfo.cpp @@ -117,10 +117,10 @@ SourceFileInfo::SourceFileInfo(const GlobalVariable *Desc, if (ConstantInt *CUI = dyn_cast(CS->getOperand(1))) Version = CUI->getZExtValue(); - const char *SI = GetConstantStringInfo(CS->getOperand(3)); - BaseName = (SI ? SI : ""); - SI = GetConstantStringInfo(CS->getOperand(4)); - Directory = (SI ? SI : ""); + if (!GetConstantStringInfo(CS->getOperand(3), BaseName)) + BaseName = ""; + if (!GetConstantStringInfo(CS->getOperand(4), Directory)) + Directory = ""; } } @@ -160,8 +160,8 @@ SourceFunctionInfo::SourceFunctionInfo(ProgramInfo &PI, SourceFile = &PI.getSourceFile(GV); // Entry #2 is the function name. - const char *SI = GetConstantStringInfo(CS->getOperand(2)); - Name = (SI ? SI : ""); + if (!GetConstantStringInfo(CS->getOperand(2), Name)) + Name = ""; } } -- cgit v1.2.3-18-g5258