irgen: do not emit an extra terminator for panic thunks
Found with GoSmith.
Differential Revision: http://reviews.llvm.org/D6714
llvm-svn: 224904
GitOrigin-RevId: b6edff93aecdc9fb6a3dede4e79181469ea680b8
diff --git a/irgen/builtins.go b/irgen/builtins.go
index 404962f..8e4dc87 100644
--- a/irgen/builtins.go
+++ b/irgen/builtins.go
@@ -110,7 +110,9 @@
return newValue(llv, eface)
}
-func (fr *frame) callPanic(arg *govalue) {
+func (fr *frame) callPanic(arg *govalue, term bool) {
fr.runtime.panic.call(fr, arg.value)
- fr.builder.CreateUnreachable()
+ if term {
+ fr.builder.CreateUnreachable()
+ }
}
diff --git a/irgen/ssa.go b/irgen/ssa.go
index 2c7c202..706eb77 100644
--- a/irgen/ssa.go
+++ b/irgen/ssa.go
@@ -1079,7 +1079,7 @@
case *ssa.Panic:
arg := fr.value(instr.X)
- fr.callPanic(arg)
+ fr.callPanic(arg, true)
case *ssa.Phi:
typ := instr.Type()
@@ -1190,7 +1190,7 @@
return nil
case "panic":
- fr.callPanic(fr.value(args[0]))
+ fr.callPanic(fr.value(args[0]), false)
return nil
case "recover":
diff --git a/test/irgen/go-panic.go b/test/irgen/go-panic.go
new file mode 100644
index 0000000..35b0a47
--- /dev/null
+++ b/test/irgen/go-panic.go
@@ -0,0 +1,10 @@
+// RUN: llgo -S -emit-llvm -o - %s | FileCheck %s
+
+package foo
+
+func F() {
+ // CHECK: call void @__go_panic
+ // CHECK-NEXT: ret void
+ // CHECK-NEXT: }
+ go panic("")
+}
