diff options
| author | Bill Wendling <isanbard@gmail.com> | 2009-03-13 04:39:26 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2009-03-13 04:39:26 +0000 |
| commit | f3f16e873f4ab3369a996f2c07c84df94dca2d82 (patch) | |
| tree | f6acdc868987413752d785dabab58cbb8e72e6b1 /lib/CodeGen/SelectionDAG/SelectionDAG.cpp | |
| parent | ec6ffc713f5f6e584debda7c55e1b37652e63617 (diff) | |
| download | external_llvm-f3f16e873f4ab3369a996f2c07c84df94dca2d82.zip external_llvm-f3f16e873f4ab3369a996f2c07c84df94dca2d82.tar.gz external_llvm-f3f16e873f4ab3369a996f2c07c84df94dca2d82.tar.bz2 | |
Oops...I committed too much.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66867 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 4afc3b5..71560fe2 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -2931,11 +2931,8 @@ static bool isMemSrcFromString(SDValue Src, std::string &Str) { return false; GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal()); - if (GV) { - const char *SI = GetConstantStringInfo(GV, SrcDelta, false); - Str = (SI ? SI : ""); - if (!Str.empty()) return true; - } + if (GV && GetConstantStringInfo(GV, Str, SrcDelta, false)) + return true; return false; } |