diff options
| author | Chris Lattner <sabre@nondot.org> | 2012-02-05 02:29:43 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2012-02-05 02:29:43 +0000 |
| commit | 18c7f80b3e83ab584bd8572695a3cde8bafd9d3c (patch) | |
| tree | 93b57cd1b5fb8fa1e48c06e4bef7571f02603243 /lib/AsmParser/LLParser.cpp | |
| parent | eea723fe02edba0a1215fa235ba425ae93202dc9 (diff) | |
reapply the patches reverted in r149470 that reenable ConstantDataArray,
but with a critical fix to the SelectionDAG code that optimizes copies
from strings into immediate stores: the previous code was stopping reading
string data at the first nul. Address this by adding a new argument to
llvm::getConstantStringInfo, preserving the behavior before the patch.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149800 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser/LLParser.cpp')
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index da72ba5faf..e9e16abddb 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -2018,7 +2018,8 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) { } case lltok::kw_c: // c "foo" Lex.Lex(); - ID.ConstantVal = ConstantArray::get(Context, Lex.getStrVal(), false); + ID.ConstantVal = ConstantDataArray::getString(Context, Lex.getStrVal(), + false); if (ParseToken(lltok::StringConstant, "expected string")) return true; ID.Kind = ValID::t_Constant; return false; |