From 0dff37fb924f4d2c44f2912a524dfc4c152ce945 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Wed, 17 Dec 2003 04:45:53 +0000 Subject: re PR c++/12218 (runtime segfault when initializing global variable with pointer-to-member) PR c++/12218 * varasm.c (initializer_constant_valid_p): Allow a conversion from an integral constant to an OFFSET_TYPE. PR c++/12696 * decl.c (reshape_init): Recover quickly from errors. PR c++/12218 * g++.dg/init/pm3.C: New test. PR c++/12696 * g++.dg/init/error1.C: New test. From-SVN: r74731 --- gcc/varasm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcc/varasm.c') diff --git a/gcc/varasm.c b/gcc/varasm.c index 5257810..4fecf37 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -3592,7 +3592,8 @@ initializer_constant_valid_p (tree value, tree endtype) /* Likewise conversions from int to pointers, but also allow conversions from 0. */ - if (POINTER_TYPE_P (TREE_TYPE (value)) + if ((POINTER_TYPE_P (TREE_TYPE (value)) + || TREE_CODE (TREE_TYPE (value)) == OFFSET_TYPE) && INTEGRAL_TYPE_P (TREE_TYPE (TREE_OPERAND (value, 0)))) { if (integer_zerop (TREE_OPERAND (value, 0))) -- cgit v1.1