summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-06-28 05:33:32 +0000
committerChris Lattner <sabre@nondot.org>2008-06-28 05:33:32 +0000
commit17013286755b05167ce896701769c23b392fe366 (patch)
tree9b4d516915b6e8aaac56c116708dfea509113aaf /llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
parentebf1f67193edc93adaacc1d0d3829bd21f2684b4 (diff)
downloadbcm5719-llvm-17013286755b05167ce896701769c23b392fe366.tar.gz
bcm5719-llvm-17013286755b05167ce896701769c23b392fe366.zip
Add back the capability to include nul characters in strings with
GetConstantStringInfo. This will hopefully restore llvm-gcc to happy bootstrap land. llvm-svn: 52851
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 65d2d6ba380..717ad34f408 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2594,7 +2594,7 @@ static bool isMemSrcFromString(SDOperand Src, std::string &Str,
return false;
GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal());
- if (GV && GetConstantStringInfo(GV, Str)) {
+ if (GV && GetConstantStringInfo(GV, Str, SrcDelta, false)) {
SrcOff += SrcDelta;
return true;
}
OpenPOWER on IntegriCloud