aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/varpool.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f24e900..a84ef2d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-29 Jan Hubicka <jh@suse.cz>
+
+ * varpool.c (varpool_get_node): Fix lookup.
+
2010-05-29 Steven Bosscher <steven@gcc.gnu.org>
* config/spu/spu-protos.h: Do not include rtl.h. Protect
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 180e21e..2e8e945 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -117,7 +117,9 @@ varpool_get_node (tree decl)
return NULL;
key.decl = decl;
slot = (struct varpool_node **)
- htab_find_slot (varpool_hash, &key, INSERT);
+ htab_find_slot (varpool_hash, &key, NO_INSERT);
+ if (!slot)
+ return NULL;
return *slot;
}