diff options
| author | Jason Merrill <jason@redhat.com> | 2002-05-09 13:27:37 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2002-05-09 13:27:37 -0400 |
| commit | c87978aa20c2807f8654f16ac3668ea67e9e5a9a (patch) | |
| tree | 8de79106bf22e9d38596fd2528e50ab966541607 /gcc/cp/cvt.c | |
| parent | ff431459927172204c448438bf7de202480a9d87 (diff) | |
| download | gcc-c87978aa20c2807f8654f16ac3668ea67e9e5a9a.zip gcc-c87978aa20c2807f8654f16ac3668ea67e9e5a9a.tar.gz gcc-c87978aa20c2807f8654f16ac3668ea67e9e5a9a.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 3 |
1 files changed, 3 insertions, 0 deletions
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)) |