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/Bitcode/Writer/ValueEnumerator.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/Bitcode/Writer/ValueEnumerator.cpp')
| -rw-r--r-- | lib/Bitcode/Writer/ValueEnumerator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp index 1c4d670b27..1ed9004eb5 100644 --- a/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -321,10 +321,6 @@ void ValueEnumerator::EnumerateValue(const Value *V) { if (const Constant *C = dyn_cast<Constant>(V)) { if (isa<GlobalValue>(C)) { // Initializers for globals are handled explicitly elsewhere. - } else if (isa<ConstantArray>(C) && cast<ConstantArray>(C)->isString()) { - // Do not enumerate the initializers for an array of simple characters. - // The initializers just pollute the value table, and we emit the strings - // specially. } else if (C->getNumOperands()) { // If a constant has operands, enumerate them. This makes sure that if a // constant has uses (for example an array of const ints), that they are |