diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/CFIInstrInserter.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/cfi-inserter-noreturnblock.mir | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/CFIInstrInserter.cpp b/llvm/lib/CodeGen/CFIInstrInserter.cpp index 00ebf63fc17..4fd119430cf 100644 --- a/llvm/lib/CodeGen/CFIInstrInserter.cpp +++ b/llvm/lib/CodeGen/CFIInstrInserter.cpp @@ -317,6 +317,10 @@ unsigned CFIInstrInserter::verify(MachineFunction &MF) { // outgoing offset and register values of CurrMBB if (SuccMBBInfo.IncomingCFAOffset != CurrMBBInfo.OutgoingCFAOffset || SuccMBBInfo.IncomingCFARegister != CurrMBBInfo.OutgoingCFARegister) { + // Inconsistent offsets/registers are ok for 'noreturn' blocks because + // we don't generate epilogues inside such blocks. + if (SuccMBBInfo.MBB->succ_empty() && !SuccMBBInfo.MBB->isReturnBlock()) + continue; report(CurrMBBInfo, SuccMBBInfo); ErrorNum++; } diff --git a/llvm/test/CodeGen/X86/cfi-inserter-noreturnblock.mir b/llvm/test/CodeGen/X86/cfi-inserter-noreturnblock.mir new file mode 100644 index 00000000000..809cd377e76 --- /dev/null +++ b/llvm/test/CodeGen/X86/cfi-inserter-noreturnblock.mir @@ -0,0 +1,30 @@ +# RUN: llc -o - %s -mtriple=x86_64-- -verify-cfiinstrs \ +# RUN: -run-pass=cfi-instr-inserter + +# Test that CFI verifier does not report inconsistent offset for the +# 'noreturn' block. +--- +name: testNoreturnBlock +body: | + bb.0: + CFI_INSTRUCTION def_cfa_offset 24 + JNE_1 %bb.2, implicit undef $eflags + + bb.1: + CFI_INSTRUCTION def_cfa_offset 32 + + bb.2: + TRAP +... + +# C code to reproduce the issue, built with +# '-O2 -mllvm -tail-merge-size=1 -mllvm -verify-cfiinstrs': +# +# void foo1(int v) __attribute__((noreturn)) { +# if (v == 1) { +# __builtin_trap(); +# } +# if (foo2(v)) { +# __builtin_trap(); +# } +# } |
