Revert my last couple of patches. They appear to have broken bison.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94841 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp
index f06cd12..47c37c4 100644
--- a/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -633,42 +633,16 @@
break;
}
case Intrinsic::objectsize: {
- const Type *ReturnTy = CI.getType();
- Value *Op1 = II->getOperand(1);
-
- // If we're a constant expr then we just return the number of bytes
- // left in whatever we're indexing. Since it's constant there's no
- // need for maximum or minimum bytes.
- if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Op1)) {
- // If this isn't a GEP give up.
- if (CE->getOpcode() != Instruction::GetElementPtr) return 0;
-
- const PointerType *ObjTy =
- reinterpret_cast<const PointerType*>(CE->getOperand(0)->getType());
+ ConstantInt *Const = cast<ConstantInt>(II->getOperand(2));
+ const Type *Ty = CI.getType();
- if (const ArrayType *AT = dyn_cast<ArrayType>(ObjTy->getElementType())) {
-
- // Deal with multi-dimensional arrays
- const ArrayType *SAT = AT;
- while ((AT = dyn_cast<ArrayType>(AT->getElementType())))
- SAT = AT;
-
- size_t numElems = SAT->getNumElements();
- // We return the remaining bytes, so grab the size of an element
- // in bytes.
- size_t sizeofElem = SAT->getElementType()->getPrimitiveSizeInBits() / 8;
-
- ConstantInt *Const =
- cast<ConstantInt>(CE->getOperand(CE->getNumOperands() - 1));
- size_t indx = Const->getZExtValue();
- return ReplaceInstUsesWith(CI,
- ConstantInt::get(ReturnTy,
- ((numElems - indx) * sizeofElem)));
- }
- }
-
- // TODO: Add more Instruction types here.
-
+ // 0 is maximum number of bytes left, 1 is minimum number of bytes left.
+ // TODO: actually add these values, the current return values are "don't
+ // know".
+ if (Const->getZExtValue() == 0)
+ return ReplaceInstUsesWith(CI, Constant::getAllOnesValue(Ty));
+ else
+ return ReplaceInstUsesWith(CI, ConstantInt::get(Ty, 0));
}
}