RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

[Transforms] Preserve metadata when converting invoke to call.

Browse Source 
The `changeToCall` function did not preserve the invoke's metadata.
Currently, there is probably no metadata that depends on being applied
on a CallInst or InvokeInst. Therefore we can replace the instruction's
metadata.

This fixes http://llvm.org/PR39994

Suggested-by: Moritz Kreutzer <moritz.kreutzer@siemens.com>

Differential Revision: https://reviews.llvm.org/D55666

llvm-svn: 349170
This commit is contained in:
Michael Kruse 2018-12-14 18:15:11 +00:00
parent 0a0be9b76e
commit c18f383859
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Transforms/Utils/Local.cpp
View File

@ -1970,6 +1970,7 @@ static void changeToCall(InvokeInst *II, DomTreeUpdater *DTU = nullptr) {
NewCall->setCallingConv(II->getCallingConv());
NewCall->setAttributes(II->getAttributes());
NewCall->setDebugLoc(II->getDebugLoc());
NewCall->copyMetadata(*II);
II->replaceAllUsesWith(NewCall);
// Follow the call by a branch to the normal destination.

44
test/Transforms/PruneEH/looptest.ll Normal file
View File

@ -0,0 +1,44 @@
; RUN: opt < %s -prune-eh -S | FileCheck %s
declare void @nounwind() nounwind
define internal void @foo() {
call void @nounwind()
ret void
}
; CHECK-LABEL: @caller
define i32 @caller(i32 %n) personality i32 (...)* @__gxx_personality_v0 {
entry:
br label %for
for:
%j = phi i32 [0, %entry], [%j.inc, %inc]
%j.cmp = icmp slt i32 %j, %n
br i1 %j.cmp, label %body, label %exit, !llvm.loop !0
body:
; CHECK: call void @foo(), !llvm.mem.parallel_loop_access !0
invoke void @foo( )
to label %Normal unwind label %Except, !llvm.mem.parallel_loop_access !0
br label %inc
inc:
%j.inc = add nuw nsw i32 %j, 1
br label %for, !llvm.loop !0
exit:
br label %Normal
Normal:
ret i32 0
Except:
landingpad { i8*, i32 }
catch i8* null
ret i32 1
}
declare i32 @__gxx_personality_v0(...)
!0 = distinct !{!0}