optimize.c (expand_call_inline): Don't walk subtrees of type nodes.

	* optimize.c (expand_call_inline): Don't walk subtrees of type
	nodes.

	* g++.old-deja/g++.other/inline19.c: Remove XFAIL.

From-SVN: r39873

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0f94cec1354c90f3949ee444cd94061a6d08384a..cf3d059f82ff871ae001a5dbb19028b4eda92b55 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-18  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       * optimize.c (expand_call_inline): Don't walk subtrees of type
+       nodes.
+
 2001-02-18  Mark Mitchell  <mark@codesourcery.com>
 
        * class.c (add_vcall_offset_vtbl_entries_1): Only add one entry

diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 9d700f60904c6f777db28ba41d64f818d60256b3..115b4670adb1f38e013a09a8fb90b4d5fbb4eb72 100644 (file)
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -673,6 +673,12 @@ expand_call_inline (tp, walk_subtrees, data)
       return NULL_TREE;
     }
 
+  if (TREE_CODE_CLASS (TREE_CODE (t)) == 't')
+    /* Because types were not copied in copy_body, CALL_EXPRs beneath
+       them should not be expanded.  This can happen if the type is a
+       dynamic array type, for example.  */
+    *walk_subtrees = 0;
+
   /* From here on, we're only interested in CALL_EXPRs.  */
   if (TREE_CODE (t) != CALL_EXPR)
     return NULL_TREE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ff6cea8eedce39827128c8ecaa73a222e35fd8b3..998ef715732cda3c0fef72665ed367e6dd428687 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-18  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       * g++.old-deja/g++.other/inline19.c: Remove XFAIL.
+
 2001-02-16  Gabriel Dos Reis <gdr@codesourcery.com>
 
        * g++.old-deja/g++.other/decl9.C: New test.

diff --git a/gcc/testsuite/g++.old-deja/g++.other/inline19.C b/gcc/testsuite/g++.old-deja/g++.other/inline19.C
index 8770eb326d554df9a6c8ac835eac601768b827b1..c27aa5305be87852168e970ae6564439b2216159 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/inline19.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/inline19.C
@@ -2,7 +2,7 @@
 // Origin: Scott Snyder <snyder@fnal.gov> via PR 1733.
 // Special g++ Options: -O1
 //
-// crash test - XFAIL *-*-*
+// crash test
 
 struct TBtItem
 {