Fix the previous bug the correct way. This fixes ptrdist/bc
llvm-svn: 17201
diff --git a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
index 0f298dc..575dd34 100644
--- a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -151,8 +151,8 @@
unsigned FirstNonStringID = 0;
for (unsigned i = 0, e = Plane.size(); i != e; ++i)
if (isa<ConstantAggregateZero>(Plane[i]) ||
- isa<UndefValue>(Plane[i]) ||
- cast<ConstantArray>(Plane[i])->isString()) {
+ (isa<ConstantArray>(Plane[i]) &&
+ cast<ConstantArray>(Plane[i])->isString())) {
// Check to see if we have to shuffle this string around. If not,
// don't do anything.
if (i != FirstNonStringID) {