maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PR37339] Fix assertion in FunctionComparator::cmpInlineAsm 

Fixes bug https://bugs.llvm.org/show_bug.cgi?id=37339.

InlineAsm is only uniqued if the FunctionTypes are exactly the
same, while cmpTypes() for example considers all pointer types
in the default address space to be the same. For this reason
the end of cmpInlineAsm() can be reached.

This patch replaces the unreachable assertion with a check that
the function types are not identical.

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

Reviewers: jfb
llvm-svn: 331990
This commit is contained in:
whitequark 2018-05-10 15:05:47 +00:00
parent ec9b6be26f
commit 68403564df
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Transforms/Utils/FunctionComparator.cpp
View File

@ -710,7 +710,7 @@ int FunctionComparator::cmpInlineAsm(const InlineAsm *L,
return Res; return Res;
if (int Res = cmpNumbers(L->getDialect(), R->getDialect())) if (int Res = cmpNumbers(L->getDialect(), R->getDialect()))
return Res; return Res;
llvm_unreachable("InlineAsm blocks were not uniqued."); assert(L->getFunctionType() != R->getFunctionType());
return 0; return 0;
} }

53
llvm/test/Transforms/MergeFunc/inline-asm.ll Normal file
View File

@ -0,0 +1,53 @@
; RUN: opt -mergefunc -S < %s | FileCheck %s
; CHECK-LABEL: @int_ptr_arg_different
; CHECK-NEXT: call void asm
; CHECK-LABEL: @int_ptr_arg_same
; CHECK-NEXT: %2 = bitcast i32* %0 to float*
; CHECK-NEXT: tail call void @float_ptr_arg_same(float* %2)
; CHECK-LABEL: @int_ptr_null
; CHECK-NEXT: tail call void @float_ptr_null()
; Used to satisfy minimum size limit
declare void @stuff()
; Can be merged
define void @float_ptr_null() {
call void asm "nop", "r"(float* null)
call void @stuff()
ret void
}
define void @int_ptr_null() {
call void asm "nop", "r"(i32* null)
call void @stuff()
ret void
}
; Can be merged (uses same argument differing by pointer type)
define void @float_ptr_arg_same(float*) {
call void asm "nop", "r"(float* %0)
call void @stuff()
ret void
}
define void @int_ptr_arg_same(i32*) {
call void asm "nop", "r"(i32* %0)
call void @stuff()
ret void
}
; Can not be merged (uses different arguments)
define void @float_ptr_arg_different(float*, float*) {
call void asm "nop", "r"(float* %0)
call void @stuff()
ret void
}
define void @int_ptr_arg_different(i32*, i32*) {
call void asm "nop", "r"(i32* %1)
call void @stuff()
ret void
}