diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db42dadd97f4..2cd266e24d71 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2009-08-06  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/40964
+	* tree.c (iterative_hash_host_wide_int): Export.
+	* tree.h (iterative_hash_host_wide_int): Declare.
+	* tree-ssa-structalias.c (heapvar_map): New struct.
+	(heapvar_map_eq): New function.
+	(heapvar_map_hash): Likewise.
+	(heapvar_lookup): Adjust.
+	(heapvar_insert): Likewise.
+	(make_constraint_from_heapvar): Allow multiple heap variables
+	per decl at different offsets.
+	(init_alias_heapvars): Adjust.
+
 2009-08-04  David Daney  <ddaney@caviumnetworks.com>
 
 	* config/mips/mips.h (TARGET_SYNC_AFTER_SC): New macro.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5bbd2f8d3f89..c935ca8800ec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-06  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/40964
+	* gcc.c-torture/compile/pr40964.c: New testcase.
+
 2009-08-05  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/40847