From: Eric Christopher Date: Fri, 5 Feb 2010 19:04:06 +0000 (+0000) Subject: Remove this code for now. I have a better idea and will rewrite with X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=724bea90b01b49be9a9f513cd40abbf0338204f0;p=oota-llvm.git Remove this code for now. I have a better idea and will rewrite with that in mind. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95402 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp index ebadfbcd373..fa42b6e35ab 100644 --- a/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -632,47 +632,6 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { return EraseInstFromFunction(CI); 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(Op1)) { - // If this isn't a GEP give up. - if (CE->getOpcode() != Instruction::GetElementPtr) return 0; - - const PointerType *ObjTy = - reinterpret_cast(CE->getOperand(0)->getType()); - - if (const ArrayType *AT = dyn_cast(ObjTy->getElementType())) { - - // Deal with multi-dimensional arrays - const ArrayType *SAT = AT; - while ((AT = dyn_cast(AT->getElementType()))) - SAT = AT; - - size_t numElems = SAT->getNumElements(); - - // If numElems is 0, we don't know how large the array is so we can't - // make any determinations yet. - if (numElems == 0) break; - - // We return the remaining bytes, so grab the size of an element - // in bytes. - size_t sizeofElem = SAT->getElementType()->getPrimitiveSizeInBits() / 8; - - ConstantInt *Const = - cast(CE->getOperand(CE->getNumOperands() - 1)); - size_t indx = Const->getZExtValue(); - return ReplaceInstUsesWith(CI, - ConstantInt::get(ReturnTy, - ((numElems - indx) * sizeofElem))); - } - } - // TODO: Add more types here. - } } return visitCallSite(II); diff --git a/test/Transforms/InstCombine/objsize.ll b/test/Transforms/InstCombine/objsize.ll index fed067c0c6a..41d071517df 100644 --- a/test/Transforms/InstCombine/objsize.ll +++ b/test/Transforms/InstCombine/objsize.ll @@ -1,5 +1,10 @@ +; Test a pile of objectsize bounds checking. ; RUN: opt < %s -instcombine -S | FileCheck %s -@a = common global [60 x i8] zeroinitializer, align 1 ; <[60 x i8]*> +; XFAIL: * +; We need target data to get the sizes of the arrays and structures. +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" + +@a = private global [60 x i8] zeroinitializer, align 1 ; <[60 x i8]*> @.str = private constant [8 x i8] c"abcdefg\00" ; <[8 x i8]*> define i32 @foo() nounwind { @@ -27,6 +32,13 @@ cond.false: ret i8* %2; } +define i32 @f() nounwind { +; CHECK: @f +; CHECK-NEXT: ret i32 0 + %1 = call i32 @llvm.objectsize.i32(i8* getelementptr ([60 x i8]* @a, i32 1, i32 0), i1 false) + ret i32 %1 +} + @window = external global [0 x i8] define i1 @baz() nounwind { @@ -37,5 +49,4 @@ define i1 @baz() nounwind { ret i1 %2 } - declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly \ No newline at end of file