From c87978aa20c2807f8654f16ac3668ea67e9e5a9a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 9 May 2002 13:27:37 -0400 Subject: typeck.c (get_member_function_from_ptrfunc): Reorganize. * typeck.c (get_member_function_from_ptrfunc): Reorganize. Use subtraction rather than a bitmask to get the index. * cvt.c (cp_convert_to_pointer): Bail on an error_mark_node. * pt.c (tsubst_expr) [ASM_STMT]: Copy ASM_INPUT_P. From-SVN: r53335 --- gcc/cp/cvt.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gcc/cp/cvt.c') diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index b5306c1..fc57dd3 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -130,6 +130,9 @@ cp_convert_to_pointer (type, expr, force) intype = TREE_TYPE (expr); } + if (expr == error_mark_node) + return error_mark_node; + form = TREE_CODE (intype); if (POINTER_TYPE_P (intype)) -- cgit v1.1