RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

MergeFunc patch from Björn Steinbrink.

Browse Source 
Phabricator ticket: D4246, Don't merge functions with different range metadata on call/invoke.
Thanks!

llvm-svn: 213060
This commit is contained in:
Stepan Dyatkovskiy 2014-07-15 10:46:51 +00:00
parent 93f17f8aee
commit d2c35e9525
2 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Transforms/IPO/MergeFunctions.cpp
View File

@ -766,13 +766,23 @@ int FunctionComparator::cmpOperation(const Instruction *L,
if (int Res = cmpNumbers(CI->getCallingConv(),
cast<CallInst>(R)->getCallingConv()))
return Res;
return cmpAttrs(CI->getAttributes(), cast<CallInst>(R)->getAttributes());
if (int Res =
cmpAttrs(CI->getAttributes(), cast<CallInst>(R)->getAttributes()))
return Res;
return cmpNumbers(
(uint64_t)CI->getMetadata(LLVMContext::MD_range),
(uint64_t)cast<CallInst>(R)->getMetadata(LLVMContext::MD_range));
}
if (const InvokeInst *CI = dyn_cast<InvokeInst>(L)) {
if (int Res = cmpNumbers(CI->getCallingConv(),
cast<InvokeInst>(R)->getCallingConv()))
return Res;
return cmpAttrs(CI->getAttributes(), cast<InvokeInst>(R)->getAttributes());
if (int Res =
cmpAttrs(CI->getAttributes(), cast<InvokeInst>(R)->getAttributes()))
return Res;
return cmpNumbers(
(uint64_t)CI->getMetadata(LLVMContext::MD_range),
(uint64_t)cast<InvokeInst>(R)->getMetadata(LLVMContext::MD_range));
}
if (const InsertValueInst *IVI = dyn_cast<InsertValueInst>(L)) {
ArrayRef<unsigned> LIndices = IVI->getIndices();

91
test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll Normal file
View File

@ -0,0 +1,91 @@
; RUN: opt -mergefunc -S < %s | FileCheck %s
define i8 @call_with_range() {
bitcast i8 0 to i8 ; dummy to make the function large enough
%out = call i8 @dummy(), !range !0
ret i8 %out
}
define i8 @call_no_range() {
; CHECK-LABEL: @call_no_range
; CHECK-NEXT: bitcast i8 0 to i8
; CHECK-NEXT: %out = call i8 @dummy()
; CHECK-NEXT: ret i8 %out
bitcast i8 0 to i8
%out = call i8 @dummy()
ret i8 %out
}
define i8 @call_different_range() {
; CHECK-LABEL: @call_different_range
; CHECK-NEXT: bitcast i8 0 to i8
; CHECK-NEXT: %out = call i8 @dummy(), !range !1
; CHECK-NEXT: ret i8 %out
bitcast i8 0 to i8
%out = call i8 @dummy(), !range !1
ret i8 %out
}
define i8 @invoke_with_range() {
%out = invoke i8 @dummy() to label %next unwind label %lpad, !range !0
next:
ret i8 %out
lpad:
%pad = landingpad { i8*, i32 } personality i8* undef cleanup
resume { i8*, i32 } zeroinitializer
}
define i8 @invoke_no_range() {
; CHECK-LABEL: @invoke_no_range()
; CHECK-NEXT: invoke i8 @dummy
%out = invoke i8 @dummy() to label %next unwind label %lpad
next:
ret i8 %out
lpad:
%pad = landingpad { i8*, i32 } personality i8* undef cleanup
resume { i8*, i32 } zeroinitializer
}
define i8 @invoke_different_range() {
; CHECK-LABEL: @invoke_different_range()
; CHECK-NEXT: invoke i8 @dummy
%out = invoke i8 @dummy() to label %next unwind label %lpad, !range !1
next:
ret i8 %out
lpad:
%pad = landingpad { i8*, i32 } personality i8* undef cleanup
resume { i8*, i32 } zeroinitializer
}
define i8 @call_same_range() {
; CHECK-LABEL: @call_same_range
; CHECK: tail call i8 @call_with_range
bitcast i8 0 to i8
%out = call i8 @dummy(), !range !0
ret i8 %out
}
define i8 @invoke_same_range() {
; CHECK-LABEL: @invoke_same_range()
; CHECK: tail call i8 @invoke_with_range()
%out = invoke i8 @dummy() to label %next unwind label %lpad, !range !0
next:
ret i8 %out
lpad:
%pad = landingpad { i8*, i32 } personality i8* undef cleanup
resume { i8*, i32 } zeroinitializer
}
declare i8 @dummy();
declare i32 @__gxx_personality_v0(...)
!0 = metadata !{i8 0, i8 2}
!1 = metadata !{i8 5, i8 7}