[llvm] r236912 - [opaque pointer type] Cleanup a few references to pointee types using nearby non-pointee types of the same value

[Quentin Colombet]

Hi David,

Looks like this change broke a couple of bots:
http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/26334 <http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/26334>
http://lab.llvm.org:8011/builders/clang-cmake-thumbv7-a15/builds/2144 <http://lab.llvm.org:8011/builders/clang-cmake-thumbv7-a15/builds/2144>

Could you revert or fix please?

Thanks,
-Quentin
> On May 8, 2015, at 3:47 PM, David Blaikie <dblaikie at gmail.com> wrote:
> 
> Author: dblaikie
> Date: Fri May  8 17:47:50 2015
> New Revision: 236912
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=236912&view=rev
> Log:
> [opaque pointer type] Cleanup a few references to pointee types using nearby non-pointee types of the same value
> 
> & cleanup a convoluted return expression while I'm here
> 
> Modified:
>    llvm/trunk/lib/IR/Verifier.cpp
> 
> Modified: llvm/trunk/lib/IR/Verifier.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=236912&r1=236911&r2=236912&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/Verifier.cpp (original)
> +++ llvm/trunk/lib/IR/Verifier.cpp Fri May  8 17:47:50 2015
> @@ -1503,7 +1503,7 @@ void Verifier::VerifyStatepoint(Immutabl
>   const PointerType *PT = dyn_cast<PointerType>(Target->getType());
>   Assert(PT && PT->getElementType()->isFunctionTy(),
>          "gc.statepoint callee must be of function pointer type", &CI, Target);
> -  FunctionType *TargetFuncType = cast<FunctionType>(PT->getElementType());
> +  FunctionType *TargetFuncType = CS.getFunctionType();
> 
>   const Value *NumCallArgsV = CS.getArgument(1);
>   Assert(isa<ConstantInt>(NumCallArgsV),
> @@ -3065,8 +3065,8 @@ bool Verifier::VerifyIntrinsicType(Type
>       dyn_cast<PointerType>(ThisArgVecTy->getVectorElementType());
>     if (!ThisArgEltTy)
>       return true;
> -    return (!(ThisArgEltTy->getElementType() ==
> -            ReferenceType->getVectorElementType()));
> +    return ThisArgEltTy->getElementType() !=
> +           ReferenceType->getVectorElementType();
>   }
>   }
>   llvm_unreachable("unhandled");
> @@ -3192,7 +3192,7 @@ void Verifier::visitIntrinsicFunctionCal
>       Assert(AI, "llvm.gcroot parameter #1 must be an alloca.", &CI);
>       Assert(isa<Constant>(CI.getArgOperand(1)),
>              "llvm.gcroot parameter #2 must be a constant.", &CI);
> -      if (!AI->getType()->getElementType()->isPointerTy()) {
> +      if (!AI->getAllocatedType()->isPointerTy()) {
>         Assert(!isa<ConstantPointerNull>(CI.getArgOperand(1)),
>                "llvm.gcroot parameter #1 must either be a pointer alloca, "
>                "or argument #2 must be a non-null constant.",
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150508/e6bf87bc/attachment.html>