From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 7 Dec 2015 16:08:42 +0000 (+0000)
Subject: 	gcc/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64204dac607f7fd9e5a4539a8935fc70b26e082d;p=thirdparty%2Fgcc.git

	gcc/
	* config/nvptx/nvptx.c (nvptx_output_call_insn): Emit trap after no
	return call.

	gcc/testsuite/
	* gcc.target/nvptx/abort.c: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231368 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80e848123c9d..2b9211992ff8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-07  Nathan Sidwell  <nathan@acm.org>
+
+	* config/nvptx/nvptx.c (nvptx_output_call_insn): Emit trap after no
+	return call.
+
 2015-12-07  David Malcolm  <dmalcolm@redhat.com>
 
 	* pretty-print.c (text_info::set_range): Rename to...
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 2dec8467437f..6ce8d4b37d5c 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -1890,6 +1890,13 @@ nvptx_output_call_insn (rtx_insn *insn, rtx result, rtx callee)
     }
   fprintf (asm_out_file, ";\n");
 
+  if (find_reg_note (insn, REG_NORETURN, NULL))
+    /* No return functions confuse the PTX JIT, as it doesn't realize
+       the flow control barrier they imply.  It can seg fault if it
+       encounters what looks like an unexitable loop.  Emit a trailing
+       trap, which it does grok.  */
+    fprintf (asm_out_file, "\t\ttrap; // (noreturn)\n");
+
   return result != NULL_RTX ? "\tld.param%t0\t%0, [%%retval_in];\n\t}" : "}";
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 93f3af2a201f..2a8fce8903b7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-07  Nathan Sidwell  <nathan@acm.org>
+
+	* gcc.target/nvptx/abort.c: New.
+
 2015-12-07  David Malcolm  <dmalcolm@redhat.com>
 
 	* gcc.dg/diagnostic-ranges-1.c: New test file.
diff --git a/gcc/testsuite/gcc.target/nvptx/abort.c b/gcc/testsuite/gcc.target/nvptx/abort.c
new file mode 100644
index 000000000000..d32206874008
--- /dev/null
+++ b/gcc/testsuite/gcc.target/nvptx/abort.c
@@ -0,0 +1,13 @@
+/* { dg-do compile} */
+/* Annotate no return functions with a trailing 'trap'.  */
+
+extern void abort ();
+
+int main (int argc, char **argv)
+{
+  if (argc > 2)
+    abort ();
+  return 0;
+}
+
+/* { dg-final { scan-assembler "call abort;\[\r\n\t \]+trap;" } } */