From: Marek Polacek <polacek@redhat.com>
Date: Wed, 3 Apr 2013 16:01:38 +0000 (+0000)
Subject: re PR sanitizer/55702 (ICE: in instrument_func_exit, at tsan.c:684 with -fsanitize... 
X-Git-Tag: releases/gcc-4.9.0~6687
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71c581e77d0da68c1364fa14ae06402bd8f44cc8;p=thirdparty%2Fgcc.git

re PR sanitizer/55702 (ICE: in instrument_func_exit, at tsan.c:684 with -fsanitize=thread and __builtin_return())

	PR sanitizer/55702
	* tsan.c (instrument_func_exit): Allow BUILT_IN_RETURN
	functions.

	* gcc.dg/pr55702.c: New test.

From-SVN: r197430
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ce142c7707d..7d86b2868092 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-03  Marek Polacek  <polacek@redhat.com>
+
+	PR sanitizer/55702
+	* tsan.c (instrument_func_exit): Allow BUILT_IN_RETURN
+	functions.
+
 2013-04-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR target/56809
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e64fa68db9a..b5530fe75ad1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-03  Marek Polacek  <polacek@redhat.com>
+
+	PR sanitizer/55702
+	* gcc.dg/pr55702.c: New test.
+
 2013-04-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR target/56809
diff --git a/gcc/testsuite/gcc.dg/pr55702.c b/gcc/testsuite/gcc.dg/pr55702.c
new file mode 100644
index 000000000000..8770a3758d7f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr55702.c
@@ -0,0 +1,9 @@
+/* PR sanitizer/55702 */
+/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */
+/* { dg-options "-fsanitize=thread" } */
+
+void
+foo ()
+{
+  __builtin_return (0);
+}
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 14f40ce99ff8..c02e100cca06 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -681,7 +681,8 @@ instrument_func_exit (void)
     {
       gsi = gsi_last_bb (e->src);
       stmt = gsi_stmt (gsi);
-      gcc_assert (gimple_code (stmt) == GIMPLE_RETURN);
+      gcc_assert (gimple_code (stmt) == GIMPLE_RETURN
+		  || gimple_call_builtin_p (stmt, BUILT_IN_RETURN));
       loc = gimple_location (stmt);
       builtin_decl = builtin_decl_implicit (BUILT_IN_TSAN_FUNC_EXIT);
       g = gimple_build_call (builtin_decl, 0);