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/rtti.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/rtti.c')
| -rw-r--r-- | gcc/cp/rtti.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index a36851d..4eb2ba7 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -1046,9 +1046,13 @@ typeinfo_in_lib_p (tree type) case BOOLEAN_TYPE: case REAL_TYPE: case VOID_TYPE: - case NULLPTR_TYPE: return true; + case LANG_TYPE: + if (NULLPTR_TYPE_P (type)) + return true; + /* else fall through. */ + default: return false; } @@ -1454,7 +1458,6 @@ emit_support_tinfos (void) { /* Dummy static variable so we can put nullptr in the array; it will be set before we actually start to walk the array. */ - static tree nullptr_type_node; static tree *const fundamentals[] = { &void_type_node, @@ -1484,7 +1487,6 @@ emit_support_tinfos (void) if (!dtor || DECL_EXTERNAL (dtor)) return; doing_runtime = 1; - nullptr_type_node = TREE_TYPE (nullptr_node); for (ix = 0; fundamentals[ix]; ix++) { tree bltn = *fundamentals[ix]; |