[llvm] r236919 - Revert r236912.

[Quentin Colombet]

> On May 8, 2015, at 5:52 PM, Justin Bogner <mail at justinbogner.com> wrote:
> 
> Quentin Colombet <qcolombet at apple.com> writes:
>> Author: qcolombet
>> Date: Fri May  8 19:02:06 2015
>> New Revision: 236919
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=236919&view=rev
>> Log:
>> Revert r236912.
> 
> It's helpful to mention why you're reverting in the revert message.
> Links to failing bots are good :)

Good point! I forgot to put them here after replying to the original commit.

Thanks for reminding me!

Cheers,
-Quentin

> 
>> 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=236919&r1=236918&r2=236919&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/IR/Verifier.cpp (original)
>> +++ llvm/trunk/lib/IR/Verifier.cpp Fri May  8 19:02:06 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 = CS.getFunctionType();
>> +  FunctionType *TargetFuncType = cast<FunctionType>(PT->getElementType());
>> 
>>   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->getAllocatedType()->isPointerTy()) {
>> +      if (!AI->getType()->getElementType()->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