re PR middle-end/53460 (Internal compiler error: in calc_dfs_tree, at dominance.c:395)

2012-05-24  Richard Guenther  <rguenther@suse.de>

	PR middle-end/53460
	* tree-profile.c (tree_profiling): Cleanup the CFG if
	execute_fixup_cfg requests it.

	* g++.dg/tree-prof/pr53460.C: New testcase.

From-SVN: r187831

gcc/ChangeLog

 2012-05-24  Richard Guenther  <rguenther@suse.de>
 
+	PR middle-end/53460
+	* tree-profile.c (tree_profiling): Cleanup the CFG if
+	execute_fixup_cfg requests it.
+
+2012-05-24  Richard Guenther  <rguenther@suse.de>
+
 	* tree-flow.h (create_var_ann): Remove.
 	* tree-dfa.c (create_var_ann): Remove and inline into its
 	single caller ...

gcc/testsuite/ChangeLog

 2012-05-24  Richard Guenther  <rguenther@suse.de>
 
+	PR middle-end/53460
+	* g++.dg/tree-prof/pr53460.C: New testcase.
+
+2012-05-24  Richard Guenther  <rguenther@suse.de>
+
 	PR bootstrap/53466
 	* g++.dg/debug/pr53466.C: New testcase.
 

gcc/testsuite/g++.dg/tree-prof/pr53460.C

+// { dg-options "-O" }
+
+template<typename T> class OwnPtr {
+public:
+    ~OwnPtr();
+};
+template<class T> class GlyphMetricsMap {
+public:
+    GlyphMetricsMap() { }
+    OwnPtr<int> m_pages;
+};
+class SimpleFontData {
+public:
+    void boundsForGlyph() const;
+};
+inline __attribute__((__always_inline__))
+void SimpleFontData::boundsForGlyph() const
+{
+  new GlyphMetricsMap<int>;
+}
+void offsetToMiddleOfGlyph(const SimpleFontData* fontData)
+{
+  fontData->boundsForGlyph();
+}
+int main() {}

gcc/tree-profile.c

@@ -491,7 +491,8 @@ tree_profiling (void)
       gcov_type_tmp_var = NULL_TREE;
 
       /* Local pure-const may imply need to fixup the cfg.  */
-      execute_fixup_cfg ();
+      if (execute_fixup_cfg () & TODO_cleanup_cfg)
+	cleanup_tree_cfg ();
       branch_prob ();
 
       if (! flag_branch_probabilities