From 2bd07b1de7405528ad6f7d947f95bdc32df17ef9 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Mon, 1 Sep 2014 10:12:00 +0000 Subject: [PATCH] re PR c/61271 (10 * possible coding error with logical not (!)) PR c/61271 * cgraphunit.c (handle_alias_pairs): Fix condition. From-SVN: r214783 --- gcc/ChangeLog | 8 ++++++++ gcc/cgraphunit.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 92514dda99b9..9118236a7664 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-09-01 Marek Polacek + + Backport from mainline + 2014-08-19 Marek Polacek + + PR c/61271 + * cgraphunit.c (handle_alias_pairs): Fix condition. + 2014-08-30 John David Anglin * config/pa/pa.c (pa_assemble_integer): Don't add PLABEL relocation diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 7fa8055878c8..7dd2c1d55950 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1097,7 +1097,7 @@ handle_alias_pairs (void) /* We use local aliases for C++ thunks to force the tailcall to bind locally. This is a hack - to keep it working do the following (which is not strictly correct). */ - && (! TREE_CODE (target_node->symbol.decl) == FUNCTION_DECL + && (TREE_CODE (target_node->symbol.decl) != FUNCTION_DECL || ! DECL_VIRTUAL_P (target_node->symbol.decl)) && ! lookup_attribute ("weakref", DECL_ATTRIBUTES (p->decl))) { -- 2.47.2