From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 26 Jan 2015 21:33:11 +0000 (+0100)
Subject: re PR ipa/64730 (g++.dg/ipa/pr64049-1.C ICE: SEGV when printing NULL)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b7706c830cdf535d14d68d4f2e581592fbcdb85;p=gcc.git

re PR ipa/64730 (g++.dg/ipa/pr64049-1.C ICE: SEGV when printing NULL)

	PR ipa/64730
	* ipa-inline.c (inline_small_functions): Print "unknown" even
	if edge->call_stmt is non-NULL, but has builtins or unknown
	location.

From-SVN: r220139
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f10bfb729a9..8cf5d5b104a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-26  Jakub Jelinek  <jakub@redhat.com>
 
+	PR ipa/64730
+	* ipa-inline.c (inline_small_functions): Print "unknown" even
+	if edge->call_stmt is non-NULL, but has builtins or unknown
+	location.
+
 	PR middle-end/64421
 	* omp-low.c (simd_clone_mangle): If DECL_ASSEMBLER_NAME starts
 	with asterisk, skip the first character.
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index aa93928b702..f91a6a53b44 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1822,6 +1822,9 @@ inline_small_functions (void)
 		   " Estimated badness is %f, frequency %.2f.\n",
 		   edge->caller->name (), edge->caller->order,
 		   edge->call_stmt
+		   && (LOCATION_LOCUS (gimple_location ((const_gimple)
+							edge->call_stmt))
+		       > BUILTINS_LOCATION)
 		   ? gimple_filename ((const_gimple) edge->call_stmt)
 		   : "unknown",
 		   edge->call_stmt
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26d82acbf2e..f81676e35d1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,8 +3,6 @@
 	PR c/64778
 	* gcc.dg/pr64778.c: New test.
 
-2015-01-26  Jakub Jelinek  <jakub@redhat.com>
-
 	PR middle-end/64421
 	* gcc.dg/vect/pr64421.c: New test.