diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74ad7d2dec6a5eae9a8f96d8613faca3d820d5ce..ba42078d130efcf2d6e48d665bfa40840bc848c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-06  Richard Guenther  <rguenther@suse.de>
+
+	* passes.c (execute_function_todo): Call compute_may_aliases
+	only if flag_tree_pta is set.
+
 2012-09-06  Andrew Pinski  <apinski@cavium.com>
 
 	PR tree-opt/54494
diff --git a/gcc/passes.c b/gcc/passes.c
index c2d8f086ead2e46cf8cd00336af61a3dc759f5bd..9ad40bf9e6c317ea035b7b145eeb17a5556e880e 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1776,7 +1776,8 @@ execute_function_todo (void *data)
   if (flags & TODO_rebuild_alias)
     {
       execute_update_addresses_taken ();
-      compute_may_aliases ();
+      if (flag_tree_pta)
+	compute_may_aliases ();
     }
   else if (optimize && (flags & TODO_update_address_taken))
     execute_update_addresses_taken ();