* varasm.c (const_hash): Handle FDESC_EXPR like ADDR_EXPR.

	(compare_constant): Likewise.
	(output_addressed_constants): Likewise.

	* g++.dg/opt/vt1.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54459 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0964d27..ba8541b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2002-06-10  Jakub Jelinek  <jakub@redhat.com>
 
+       * varasm.c (const_hash): Handle FDESC_EXPR like ADDR_EXPR.
+       (compare_constant): Likewise.
+       (output_addressed_constants): Likewise.
+
+2002-06-10  Jakub Jelinek  <jakub@redhat.com>
+
        * cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't
        merge bb with itself.
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index afc08f4..f90d62d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,8 @@
 
        * gcc.c-torture/compile/20020605-1.c: New test.
 
+       * g++.dg/opt/vt1.C: New test.
+
 2002-06-07  Roger Sayle  <roger@eyesopen.com>
 
        * gcc.dg/20020607-2.c: New test case.

diff --git a/gcc/testsuite/g++.dg/opt/vt1.C b/gcc/testsuite/g++.dg/opt/vt1.C
new file mode 100644 (file)
index 0000000..536a252
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/vt1.C
@@ -0,0 +1,11 @@
+// Test whether vtable for S is not put into read-only section.
+// { dg-do compile }
+// { dg-options "-O2 -fpic -fno-rtti" }
+// Origin: Jakub Jelinek <jakub@redhat.com>
+
+struct S
+{
+  virtual void vm (void) {};
+} x;
+
+// { dg-final { scan-assembler-not "section.*_ZTV1S.*\"\[^w\"\]*\"" } }

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 908f166..1b35811 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -2320,6 +2320,7 @@ const_hash (exp)
        }
 
     case ADDR_EXPR:
+    case FDESC_EXPR:
       {
        struct addr_const value;
 
@@ -2485,6 +2486,7 @@ compare_constant (t1, t2)
        }
 
     case ADDR_EXPR:
+    case FDESC_EXPR:
       {
        struct addr_const value1, value2;
 
@@ -3653,6 +3655,7 @@ output_addressed_constants (exp)
   switch (TREE_CODE (exp))
     {
     case ADDR_EXPR:
+    case FDESC_EXPR:
       /* Go inside any operations that get_inner_reference can handle and see
         if what's inside is a constant: no need to do anything here for
         addresses of variables or functions.  */