From 5d056e9be5ad2b652f1f76dc4e31621a16e541d6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 10 Jun 2002 23:43:26 +0200 Subject: [PATCH] varasm.c (const_hash): Handle FDESC_EXPR like ADDR_EXPR. * varasm.c (const_hash): Handle FDESC_EXPR like ADDR_EXPR. (compare_constant): Likewise. (output_addressed_constants): Likewise. * g++.dg/opt/vt1.C: New test. From-SVN: r54459 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 2 ++ gcc/testsuite/g++.dg/opt/vt1.C | 11 +++++++++++ gcc/varasm.c | 3 +++ 4 files changed, 22 insertions(+) create mode 100644 gcc/testsuite/g++.dg/opt/vt1.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0964d2700e5..ba8541b4399 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2002-06-10 Jakub Jelinek + + * varasm.c (const_hash): Handle FDESC_EXPR like ADDR_EXPR. + (compare_constant): Likewise. + (output_addressed_constants): Likewise. + 2002-06-10 Jakub Jelinek * cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index afc08f4b8ce..f90d62d0b3d 100644 --- 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 * 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 index 00000000000..536a2527642 --- /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 + +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 908f166ca81..1b358116bf8 100644 --- 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. */ -- 2.30.2