re PR tree-optimization/25771 (ice in coalesce_abnormal_edges, at tree-outof-ssa.c:621)

2006-01-13  Daniel Berlin  <dberlin@dberlin.org>

	PR tree-optimization/25771
	* tree-ssa-pre.c (insert_extra_phis): Don't insert merges of abnormal
	SSA_NAMES.

From-SVN: r109669

gcc/ChangeLog

+2006-01-13  Daniel Berlin  <dberlin@dberlin.org>
+
+	PR tree-optimization/25771
+	* tree-ssa-pre.c (insert_extra_phis): Don't insert merges of abnormal
+	SSA_NAMES.
+
 2006-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR tree-opt/24365

gcc/testsuite/ChangeLog

+2006-01-13 Daniel Berlin  <dberlin@dberlin.org>
+
+	PR tree-optimization/25771
+	* g++.dg/tree-ssa/pr25771.C: New test
+
 2006-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR tree-opt/24365

gcc/testsuite/g++.dg/tree-ssa/pr25771.C

+int  ggggg();
+struct string {
+  static int _S_empty_rep_storage[];
+  void  _M_destroy();
+  char* _M_rep;
+  ~string()
+  {
+    if (_M_rep != (char*)&_S_empty_rep_storage )
+      if (ggggg() <= 0)
+        _M_destroy();
+  }
+};
+extern void SDL_FreeSurface(int surface);
+struct scoped_resource {
+  ~scoped_resource()  {
+    SDL_FreeSurface(1);
+  }
+};
+struct surface {
+  scoped_resource surface_;
+};
+struct button {
+  string help_text_;
+  string label_;
+  surface image_;
+};
+struct scrollbar {
+  string help_text_;
+  button uparrow_;
+};
+scrollbar a;
+

gcc/tree-ssa-pre.c

@@ -2768,6 +2768,9 @@ insert_extra_phis (basic_block block, basic_block dom)
 	      tree val = get_value_handle (name);
 	      tree temp;
 
+	      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name))
+		continue;
+
 	      if (!mergephitemp
 		  || TREE_TYPE (name) != TREE_TYPE (mergephitemp))
 		{