diff options
| author | Jason Merrill <jason@redhat.com> | 2010-05-13 01:04:46 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-05-13 01:04:46 -0400 |
| commit | 5116acc6fefb0a16d644defe9322a7fcee768c8c (patch) | |
| tree | 572a495193f31f2ec341afb86e711e1dd2c80197 /gcc/cp/error.c | |
| parent | fbfc8363a378a676d5ab71fc44edf0b8f681ffa0 (diff) | |
| download | gcc-5116acc6fefb0a16d644defe9322a7fcee768c8c.zip gcc-5116acc6fefb0a16d644defe9322a7fcee768c8c.tar.gz gcc-5116acc6fefb0a16d644defe9322a7fcee768c8c.tar.bz2 | |
re PR bootstrap/44048 (building without C++ enabled fails)
PR bootstrap/44048
PR target/44099
gcc/cp:
* cp-tree.def (NULLPTR_TYPE): Remove.
* cp-tree.h (NULLPTR_TYPE_P): New.
(SCALAR_TYPE_P): Use it.
(nullptr_type_node): New.
(cp_tree_index): Add CPTI_NULLPTR_TYPE.
* decl.c (cxx_init_decl_processing): Call record_builtin_type on
nullptr_type_node.
* cvt.c (ocp_convert): Use NULLPTR_TYPE_P instead of NULLPTR_TYPE.
* cxx-pretty-print.c (pp_cxx_constant): Likewise.
* error.c (dump_type, dump_type_prefix, dump_type_suffix): Likewise.
* mangle.c (write_type): Likewise.
* name-lookup.c (arg_assoc_type): Likewise.
* typeck.c (build_reinterpret_cast_1): Likewise.
* rtti.c (typeinfo_in_lib_p): Likewise.
(emit_support_tinfos): Remove local nullptr_type_node.
gcc:
* dbxout.c (dbxout_type): Remove NULLPTR_TYPE handling.
* sdbout.c (plain_type_1): Likewise.
* dwarf2out.c (is_base_type): Likewise.
(gen_type_die_with_usage): Likewise. Generate
DW_TAG_unspecified_type for any LANG_TYPE.
From-SVN: r159350
Diffstat (limited to 'gcc/cp/error.c')
| -rw-r--r-- | gcc/cp/error.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 8595719..b77a94c 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -339,7 +339,10 @@ dump_type (tree t, int flags) else if (t == unknown_type_node) pp_string (cxx_pp, M_("<unresolved overloaded function type>")); else - gcc_unreachable (); + { + pp_cxx_cv_qualifier_seq (cxx_pp, t); + pp_cxx_tree_identifier (cxx_pp, TYPE_IDENTIFIER (t)); + } break; case TREE_LIST: @@ -477,10 +480,6 @@ dump_type (tree t, int flags) pp_cxx_right_paren (cxx_pp); break; - case NULLPTR_TYPE: - pp_string (cxx_pp, "std::nullptr_t"); - break; - default: pp_unsupported_tree (cxx_pp, t); /* Fall through to error. */ @@ -709,7 +708,6 @@ dump_type_prefix (tree t, int flags) case DECLTYPE_TYPE: case TYPE_PACK_EXPANSION: case FIXED_POINT_TYPE: - case NULLPTR_TYPE: dump_type (t, flags); pp_base (cxx_pp)->padding = pp_before; break; @@ -812,7 +810,6 @@ dump_type_suffix (tree t, int flags) case DECLTYPE_TYPE: case TYPE_PACK_EXPANSION: case FIXED_POINT_TYPE: - case NULLPTR_TYPE: break; default: |