aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog9
-rw-r--r--gcc/cp/error.c7
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c09daa..afbf24a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-10 Richard Biener <rguenther@suse.de>
+ Jakub Jelinek <jakub@redhat.com>
+
+ PR ipa/60761
+ * error.c (dump_decl) <case FUNCTION_DECL>: If
+ DECL_LANG_SPECIFIC is NULL, but DECL_ABSTRACT_ORIGIN is not,
+ recurse on DECL_ABSTRACT_ORIGIN instead of printing
+ <built-in>.
+
2014-04-09 Fabien ChĂȘne <fabien@gcc.gnu.org>
* pt.c (check_template_variable): Check for the return of pedwarn
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 454feb5..699d545 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1145,7 +1145,12 @@ dump_decl (cxx_pretty_printer *pp, tree t, int flags)
case FUNCTION_DECL:
if (! DECL_LANG_SPECIFIC (t))
- pp_string (pp, M_("<built-in>"));
+ {
+ if (DECL_ABSTRACT_ORIGIN (t))
+ dump_decl (pp, DECL_ABSTRACT_ORIGIN (t), flags);
+ else
+ pp_string (pp, M_("<built-in>"));
+ }
else if (DECL_GLOBAL_CTOR_P (t) || DECL_GLOBAL_DTOR_P (t))
dump_global_iord (pp, t);
else