From 97b7f1385a99158f1cd445e6c44bfe70fdad6576 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 23 Dec 2015 18:17:19 +0000 Subject: [PATCH] cgraph.h (decl_in_symtab_p): Revert check DECL_IN_CONSTANT_POOL. gcc/ * cgraph.h (decl_in_symtab_p): Revert check DECL_IN_CONSTANT_POOL. gcc/testsuite/ * gcc.dg/alias-15.c: Revert. From-SVN: r231931 --- gcc/ChangeLog | 4 ++++ gcc/cgraph.h | 8 +------- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/alias-15.c | 15 --------------- 4 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 gcc/testsuite/gcc.dg/alias-15.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9992840cf82..addc54af887 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-12-23 Nathan Sidwell + + * cgraph.h (decl_in_symtab_p): Revert check DECL_IN_CONSTANT_POOL. + 2015-12-23 Nathan Sidwell * config/nvptx/nvptx-protos.h diff --git a/gcc/cgraph.h b/gcc/cgraph.h index fe7c1940c4e..ba14215ed6f 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -2294,19 +2294,13 @@ symtab_node::real_symbol_p (void) } /* Return true if DECL should have entry in symbol table if used. - Those are functions and static & external non-constpool variables. - We do not expect constant pool variables in the varpool, as they're - not related to other variables, and simply lazily inserting them - using the regular interface results in varpool thinking they are - externally provided -- which results in erroneous assembly emission - as an undefined decl. */ + Those are functions and static & external veriables*/ static inline bool decl_in_symtab_p (const_tree decl) { return (TREE_CODE (decl) == FUNCTION_DECL || (TREE_CODE (decl) == VAR_DECL - && !DECL_IN_CONSTANT_POOL (decl) && (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b06cf76098f..1ab9fab5a75 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-12-23 Nathan Sidwell + + * gcc.dg/alias-15.c: Revert. + 2015-12-23 James Greenhalgh PR testsuite/68232 diff --git a/gcc/testsuite/gcc.dg/alias-15.c b/gcc/testsuite/gcc.dg/alias-15.c deleted file mode 100644 index 0a8e69b61ec..00000000000 --- a/gcc/testsuite/gcc.dg/alias-15.c +++ /dev/null @@ -1,15 +0,0 @@ -/* { dg-do compile } */ -/* { dg-additional-options "-O2 -fdump-ipa-cgraph" } */ - -/* RTL-level CSE shouldn't introduce LCO (for the string) into varpool */ -char *p; - -void foo () -{ - p = "abc\n"; - - while (*p != '\n') - p++; -} - -/* { dg-final { scan-ipa-dump-not "LC0" "cgraph" } } */ -- 2.30.2