diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-05-20 17:19:29 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-05-20 17:19:29 +0000 |
| commit | f0bcd16877fbedf2484a599af96321bec1274e2a (patch) | |
| tree | 4cccdbbf34c2aaca9c2e9c509c9f1cbfa649af1c /gcc | |
| parent | 06315a9a898e760c70869a0cc08e2eebac67ac71 (diff) | |
| download | gcc-f0bcd16877fbedf2484a599af96321bec1274e2a.zip gcc-f0bcd16877fbedf2484a599af96321bec1274e2a.tar.gz gcc-f0bcd16877fbedf2484a599af96321bec1274e2a.tar.bz2 | |
call.c (build_object_call): Don't look at DECL_NAME for a type.
* call.c (build_object_call): Don't look at DECL_NAME for a type.
(pt.c): Or CP_TYPE_QUALS for an ERROR_MARK.
(typeck.c): Or TYPE_MAIN_VARIANT for a type.
From-SVN: r27068
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 13 |
4 files changed, 19 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9ade541..d306b09 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 1999-05-20 Mark Mitchell <mark@codesourcery.com> + * call.c (build_object_call): Don't look at DECL_NAME for a type. + (pt.c): Or CP_TYPE_QUALS for an ERROR_MARK. + (typeck.c): Or TYPE_MAIN_VARIANT for a type. + * pt.c (for_each_template_parm): Rework to match documentation. Don't be fooled by a COMPONENT_REF with no TREE_TYPE. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index e4b1a00..e6f4187 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2336,7 +2336,11 @@ build_object_call (obj, args) return error_mark_node; } - if (DECL_NAME (cand->fn) == ansi_opname [CALL_EXPR]) + /* Since cand->fn will be a type, not a function, for a conversion + function, we must be careful not to unconditionally look at + DECL_NAME here. */ + if (TREE_CODE (cand->fn) == FUNCTION_DECL + && DECL_NAME (cand->fn) == ansi_opname [CALL_EXPR]) return build_over_call (cand, mem_args, LOOKUP_NORMAL); obj = convert_like (TREE_VEC_ELT (cand->convs, 0), obj); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b26fecb..e486920 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6541,6 +6541,8 @@ tsubst (t, args, complain, in_decl) } f = make_typename_type (ctx, f); + if (f == error_mark_node) + return f; return cp_build_qualified_type (f, CP_TYPE_QUALS (f) | CP_TYPE_QUALS (t)); diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index cdc012e..c8c11ca 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5077,17 +5077,20 @@ build_conditional_expr (ifexp, op1, op2) ifexp = op1 = save_expr (ifexp); } + type1 = TREE_TYPE (op1); + code1 = TREE_CODE (type1); + type2 = TREE_TYPE (op2); + code2 = TREE_CODE (type2); + if (op1 == error_mark_node || op2 == error_mark_node + || type1 == error_mark_node || type2 == error_mark_node) + return error_mark_node; + ifexp = cp_convert (boolean_type_node, ifexp); if (TREE_CODE (ifexp) == ERROR_MARK) return error_mark_node; /* C++: REFERENCE_TYPES must be dereferenced. */ - type1 = TREE_TYPE (op1); - code1 = TREE_CODE (type1); - type2 = TREE_TYPE (op2); - code2 = TREE_CODE (type2); - if (code1 == REFERENCE_TYPE) { op1 = convert_from_reference (op1); |