diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Hexagon/branch-non-mbb.ll | 46 |
3 files changed, 53 insertions, 0 deletions
diff --git a/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp b/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp index eb3590cb107..c3cf05541aa 100644 --- a/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp +++ b/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp @@ -377,6 +377,9 @@ bool HexagonInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB, bool LastOpcodeHasJMP_c = PredOpcodeHasJMP_c(LastOpcode); bool LastOpcodeHasNVJump = isNewValueJump(LastInst); + if (LastOpcodeHasJMP_c && !LastInst->getOperand(1).isMBB()) + return true; + // If there is only one terminator instruction, process it. if (LastInst && !SecondLastInst) { if (LastOpcode == Hexagon::J2_jump) { @@ -412,6 +415,8 @@ bool HexagonInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB, bool SecLastOpcodeHasJMP_c = PredOpcodeHasJMP_c(SecLastOpcode); bool SecLastOpcodeHasNVJump = isNewValueJump(SecondLastInst); if (SecLastOpcodeHasJMP_c && (LastOpcode == Hexagon::J2_jump)) { + if (!SecondLastInst->getOperand(1).isMBB()) + return true; TBB = SecondLastInst->getOperand(1).getMBB(); Cond.push_back(MachineOperand::CreateImm(SecondLastInst->getOpcode())); Cond.push_back(SecondLastInst->getOperand(0)); diff --git a/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp b/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp index 20c4ab112b5..69dd554cf36 100644 --- a/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp +++ b/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp @@ -485,6 +485,8 @@ bool HexagonNewValueJump::runOnMachineFunction(MachineFunction &MF) { if (predLive) break; + if (!MI->getOperand(1).isMBB()) + continue; jmpTarget = MI->getOperand(1).getMBB(); foundJump = true; if (MI->getOpcode() == Hexagon::J2_jumpf || diff --git a/llvm/test/CodeGen/Hexagon/branch-non-mbb.ll b/llvm/test/CodeGen/Hexagon/branch-non-mbb.ll new file mode 100644 index 00000000000..e86ca2ed402 --- /dev/null +++ b/llvm/test/CodeGen/Hexagon/branch-non-mbb.ll @@ -0,0 +1,46 @@ +; RUN: llc -march=hexagon < %s +; REQUIRES: asserts +; +; The tail calls to foo and bar are branches with functions as operands, +; instead of basic blocks. Make sure we don't crash on such instructions. + +target datalayout = "e-m:e-p:32:32:32-i64:64:64-i32:32:32-i16:16:16-i1:8:8-f64:64:64-f32:32:32-v64:64:64-v32:32:32-a:0-n16:32" +target triple = "hexagon" + +%struct.t0 = type { i8, [2 x i8] } +%struct.t1 = type { i8, i8, [1900 x i8], %struct.t0 } + +@var = internal global [3 x %struct.t1] zeroinitializer, align 8 +declare void @foo() #2 +declare void @bar(i32, i32) #2 + +; Function Attrs: nounwind +define void @fred(i8 signext %a, i8 signext %b) #1 { +entry: + %i = sext i8 %a to i32 + %t = getelementptr inbounds [3 x %struct.t1], [3 x %struct.t1]* @var, i32 0, i32 %i, i32 3, i32 0 + %0 = load i8, i8* %t, align 8 + switch i8 %0, label %if.end14 [ + i8 1, label %if.then + i8 0, label %do.body + ] + +if.then: ; preds = %entry + %j = sext i8 %b to i32 + %u = getelementptr inbounds [3 x %struct.t1], [3 x %struct.t1]* @var, i32 0, i32 %i, i32 3, i32 1, i32 %j + store i8 1, i8* %u, align 1 + tail call void @foo() #0 + br label %if.end14 + +do.body: ; preds = %entry + %conv11 = sext i8 %b to i32 + tail call void @bar(i32 %i, i32 %conv11) #0 + br label %if.end14 + +if.end14: ; preds = %entry, %do.body, %if.then + ret void +} + +attributes #0 = { nounwind } +attributes #1 = { nounwind "disable-tail-calls"="false" } +attributes #2 = { "disable-tail-calls"="false" } |
