Oops...I committed too much.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66867 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index 2bf993c..125ff55 100644
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -117,10 +117,10 @@
if (ConstantInt *CUI = dyn_cast<ConstantInt>(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 @@
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 = "";
}
}