Commit 443da758 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r243461: 

------------------------------------------------------------------------
r243461 | Matthew.Arsenault | 2015-07-28 14:29:14 -0400 (Tue, 28 Jul 2015) | 5 lines

AMDGPU: Fix crash if called function is a bitcast

getCalledFunction() is null, so this would crash. Replace
crash with an error on unsupported call.

------------------------------------------------------------------------

llvm-svn: 253227
parent 88a395a1

llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp

+6 −1
Original line number Diff line number Diff line
@@ -240,7 +240,12 @@ static bool collectUsesWithPtrTypes(Value *Val, std::vector<Value*> &WorkList) { 
  for (User *User : Val->users()) {

    if(std::find(WorkList.begin(), WorkList.end(), User) != WorkList.end())

      continue;

    if (isa<CallInst>(User)) {

    if (CallInst *CI = dyn_cast<CallInst>(User)) {

      // TODO: We might be able to handle some cases where the callee is a

      // constantexpr bitcast of a function.

      if (!CI->getCalledFunction())

        return false;



      WorkList.push_back(User);

      continue;

    }

llvm/test/CodeGen/AMDGPU/promote-alloca-bitcast-function.ll

0 → 100644
+22 −0
Original line number Diff line number Diff line 
; RUN: not llc -march=amdgcn < %s 2>&1 | FileCheck %s



; Make sure that AMDGPUPromoteAlloca doesn't crash if the called

; function is a constantexpr cast of a function.



declare void @foo(float*) #0

declare void @foo.varargs(...) #0



; CHECK: error: unsupported call to function foo in crash_call_constexpr_cast

define void @crash_call_constexpr_cast() #0 {

  %alloca = alloca i32

  call void bitcast (void (float*)* @foo to void (i32*)*)(i32* %alloca) #0

  ret void

}



define void @crash_call_constexpr_cast_varargs() #0 {

  %alloca = alloca i32

  call void bitcast (void (...)* @foo.varargs to void (i32*)*)(i32* %alloca) #0

  ret void

}



attributes #0 = { nounwind }