From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 5 Jan 2016 14:15:01 +0000 (+0000)
Subject: alias.c (compare_base_decls): Use symtab_node::get.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=929710d96ced4cf7b2bd6e9896b3dc051cbfa235;p=gcc.git

alias.c (compare_base_decls): Use symtab_node::get.

	gcc/
	* alias.c (compare_base_decls): Use symtab_node::get.

	gcc/testsuite/
	* gcc.dg/alias-15.c: New.

From-SVN: r232073
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83274e261a4..ff297bca9e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-05  Nathan Sidwell  <nathan@acm.org>
+
+	* alias.c (compare_base_decls): Use symtab_node::get.
+
 2016-01-05  Nick Clifton  <nickc@redhat.com>
 
 	PR target/68770
diff --git a/gcc/alias.c b/gcc/alias.c
index f5937362693..e276d71f046 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -2044,8 +2044,15 @@ compare_base_decls (tree base1, tree base2)
       || !decl_in_symtab_p (base2))
     return 0;
 
-  ret = symtab_node::get_create (base1)->equal_address_to
-		 (symtab_node::get_create (base2), true);
+  /* Don't cause symbols to be inserted by the act of checking.  */
+  symtab_node *node1 = symtab_node::get (base1);
+  if (!node1)
+    return 0;
+  symtab_node *node2 = symtab_node::get (base2);
+  if (!node2)
+    return 0;
+  
+  ret = node1->equal_address_to (node2, true);
   if (ret == 2)
     return -1;
   return ret;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1bc843dccd1..2298e084104 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-05  Nathan Sidwell  <nathan@acm.org>
+
+	* gcc.dg/alias-15.c: New.
+
 2016-01-05  Nick Clifton  <nickc@redhat.com>
 
 	PR target/68870
diff --git a/gcc/testsuite/gcc.dg/alias-15.c b/gcc/testsuite/gcc.dg/alias-15.c
new file mode 100644
index 00000000000..0a8e69b61ec
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/alias-15.c
@@ -0,0 +1,15 @@
+/* { 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" } } */