From patchwork Thu Sep 30 03:59:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Xue OS X-Patchwork-Id: 45589 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 07AA53857C52 for ; Thu, 30 Sep 2021 03:59:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07AA53857C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1632974384; bh=4x3FR2iotXSwFDZigs9gMns5coAwu9nu4yhS6/oXZcM=; h=To:Subject:Date:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=xn/0SOB9/Dfe1o5AUH/A8ZXwbU6n3y7DzBJ4baqB/4OKUY3/zhG9cH7A3hPCz2fDX OTrLyrmNADUhdRAuKGfw9IbtmS1oH6VzCF/Yrvj6JoKvOi5el2wGGz8HRRSmAtcFvq iF46uBhbxmzPe5aIlBLehLnrLot3GQathv5O4WcM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2127.outbound.protection.outlook.com [40.107.96.127]) by sourceware.org (Postfix) with ESMTPS id AB6963857C4E for ; Thu, 30 Sep 2021 03:59:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AB6963857C4E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dwGyrtYzoav547mxnalGl8fLOqBXS5kLS2rq3XwLmvVHF+YGz0OEOqx0IGO2Dh3hyZX01KgRUiP8VzGJe5nTbpz2lYGWMf5iC+rA1gPMfkNfmbdoaMTUtbHdUrCD2KKL07cdUDzDqc9ReUYh2w1gquv5vFhtYGh525ufN86ArlXIerEUfAs8/ok8qqFXFhb95nHw1myITp/3ZKKhX/gVOiPiFaHig2TxyboGOu4RcXW5d4o7bzKe+0VAzeqUfMcAMtTOpIllMp4HJAHoPfhL12pYETAmtKyj2wcMhisPD1p7rrQL94mwXZ92aJS3FnpDV+3KVVvS+LjsMEpuqGlqYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sjodTAMWWlWVHzswZobcltpzIpjEhSo2H71uXwyH5JM=; b=nOAqjKp1aQ+xF285JtrVA5YNGCNnlBmePjVrPuUOV6Zqo8supLHlG5tg5ou0ixaz0ROVQYmbQjg0HkfXoePo6X5NM43gwMIz63F5sOn7flqb1uvCzUA9YPDkuvceYFx9BAnVDjkLvdBS3Horj0WN/UR4h6so7TRP92BPU9vEyQG9cJv/9SnRfoBNmuJ9IIe3fssyBL76BsOnzmeiPd6UUOna+gg9Mlw/mN3wxha9ietWN7U3lX2JXCFiEQTB+KzWr4oF90A6/ZSuHQEJEzDM/xw6gVsL6FxoOnwsGLxHfq6okJlzUBPM17G2ID8wtUtVIzXFAo+pCGjJ6d97skrPcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none Received: from SN6PR01MB4958.prod.exchangelabs.com (2603:10b6:805:c1::15) by SN4PR01MB7487.prod.exchangelabs.com (2603:10b6:806:203::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Thu, 30 Sep 2021 03:59:09 +0000 Received: from SN6PR01MB4958.prod.exchangelabs.com ([fe80::3ce8:b43d:e19b:e1af]) by SN6PR01MB4958.prod.exchangelabs.com ([fe80::3ce8:b43d:e19b:e1af%3]) with mapi id 15.20.4566.016; Thu, 30 Sep 2021 03:59:09 +0000 To: Jan Hubicka , "mjambor@suse.cz" , Richard Biener , "gcc-patches@gcc.gnu.org" Subject: PING: [PATCH/RFC 2/2] WPD: Enable whole program devirtualization at LTRANS Thread-Topic: PING: [PATCH/RFC 2/2] WPD: Enable whole program devirtualization at LTRANS Thread-Index: AQHXqtstc2tmvlAGAkC/mchfh4Ndjau8CQ+N Date: Thu, 30 Sep 2021 03:59:09 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: suggested_attachment_session_id: 1cc7b82a-8195-1764-5184-cf4ea6b81b94 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5d2ec3e4-3336-4b69-d7d3-08d983c6a7f7 x-ms-traffictypediagnostic: SN4PR01MB7487: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0GB8+0bnH7Ftxk0wksqQqAwPwYE1YqZnuyxodneml3VHb/WWsS1rawTgZi88k3Bjd35lafJ5p+q2aMMZlXtH5rNfBtSxix7qeTckb44xq00tw4YRz+704u8GK9q3Yoq9JSKM7ERCbE0OCao436mFm3WSshzdAcTtHt3SuSXWVdQ+2KwCM/I2BHDzEIb16/XlBSV9lqYwMoCHoS5zhGIdRm1MT077cGxETA6zI116LnQZTVWwK5bTVwItVAxRnkfI9waSGLxgkEZ4NC1pvUEoRNGqedwG3CXA38g0tZyOc0y/uEtYbZH+PTvDnJJq755PkWI9Es72TiUcNcyz+zmHnU5TcfBC2Z6WJArjbmikg1nKr3CWS1DqviNEKqEuBQzZBSgFHjQavvsANhntJxpDBc3yEYwZxbG7f6DMf1M3BLblQ2KLMr9ATUO4x9+zaNGKrG43W+delvZakxqno0R9uaDQ/9ysSERCUu1Q2nnX8bhrV1jHd+eSVRJzB7CK+UEIO4Z1UtnE/rAoHo/bdx7/j+HN+mdRIZcAOcalvw0uAiWgG4N5rlakPGDz9gLPFoXQ3P9qTpSVNYcec0dMvIHm2fNqagVRBM6Jmfhp7utCWoLIklpRp9MXWzcTGIHIOaG/bvmAyLU7KFki+WrSZW1IlevTB+HEUqoeYLkS/cRNrtYy2/Q1InSZ0JTYJqBfsloUKP1Pbs5ql5Ar0c1ZbDqdQQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR01MB4958.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6506007)(38070700005)(8676002)(2906002)(83380400001)(55016002)(71200400001)(5660300002)(7696005)(316002)(52536014)(64756008)(8936002)(53546011)(33656002)(76116006)(66446008)(66556008)(66476007)(26005)(66616009)(99936003)(186003)(110136005)(86362001)(66946007)(9686003)(508600001)(122000001)(91956017)(38100700002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: lZb7XbzUe2R5vi5bXdZ5vl24PAf3xyVE/UrjKFYTug5T0CLUz8DeJDYZoIP0bLJLL6AhUh6lLX3/Cg3OlhWYaY84DJj6RyLvholDKkLWW2Wm5CpApBqMDpAmUdPfM+xy2LEiZezxTn4GAARkS6gedsWzHaZFnXrc0N2/sI524fO3cpaW3QuZ4vGBcy4xR4u2k6UIs9qGqNinzjFu8zcqT11NOJxsgtXIom7NrHapKy6mMEKtnNDmDqTczTeGW36Hfd3N/ryIY9R34xOKXoo1jQQ6bw/FFI18PnmOK2O1jH5aAz6bX0LAmpLWxXzM6ADW5nJJXZpGl7zMxM4nLleJBnBzAAphfDlSmaKDo/ZHlO4t1qiAznRz5brWgtcJE0jMQ/pVCEE5K2XXC7BbifheGwtnA18HlYTFlEQNxv7xQSDHFihEa88+IcDfeVm6859xOA72QOf5ZtjnPkCYBYC6/mXiUr2GQsOdSBc9qpmlQQuvBP2IcMJbx7Pa1hBlv2CscmlLAN8ZpcLoTf/9MOLMB0XPYcsvej8EpWAgrstYqRY1P0a852qZY6DOKnet6owpJpmk/Ttcg8PUkcq6ORgqY112GF4qx3kLLOHYeZIv3PT6+W4fpqjBHkTrPRWshKfp3JlPSI9yklg4jAJxKtzW1/wGy4/Zlg04bP36skO4XnSJ4/hzgYy2GrWQcmt3esaw24qN1wz62fbC/8hYJ1MAIhtNbg+/VgQ4rzYzxJ+XZ28= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4958.prod.exchangelabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d2ec3e4-3336-4b69-d7d3-08d983c6a7f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2021 03:59:09.3227 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: a/W4Shvx3gdg1dJpaI5Yq4Ki1jozYUntRMkNrv9YPsol4ShW5J/3C3FkYLiG1LLz6U+XNWEfIKStKKI9pSXj3Lvlx1j4B2L5wEthWdGVOhw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR01MB7487 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Feng Xue OS via Gcc-patches From: Feng Xue OS Reply-To: Feng Xue OS Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Made some minor changes. Thanks, Feng From 2c0d243b0c092585561c732bac490700f41001fb Mon Sep 17 00:00:00 2001 From: Feng Xue Date: Mon, 6 Sep 2021 20:34:50 +0800 Subject: [PATCH 2/2] WPD: Enable whole program devirtualization at LTRANS Whole program assumption would not hold when WPA splits whole compilation into more than one LTRANS partitions. To avoid information lost for WPD at LTRANS, we will record all vtable nodes and related member function references into each partition. 2021-09-07 Feng Xue gcc/ * tree.h (TYPE_CXX_LOCAL): New macro for type using base.nothrow_flag. * tree-core.h (tree_base): Update comment on using base.nothrow_flag to represent TYPE_CXX_LOCAL. * ipa-devirt.c (odr_type_d::whole_program_local): Removed. (odr_type_d::whole_program_local_p): Check TYPE_CXX_LOCAL flag on type, and enable WPD at LTRANS when flag_devirtualize_fully is true. (get_odr_type): Remove setting whole_program_local flag on type. (identify_whole_program_local_types): Replace whole_program_local in odr_type_d by TYPE_CXX_LOCAL on type. (maybe_record_node): Enable WPD at LTRANS when flag_devirtualize_fully is true. * ipa.c (can_remove_vtable_if_no_refs_p): Retain vtables at LTRANS stage under full devirtualization. * lto-cgraph.c (compute_ltrans_boundary): Add all defined vtables to boundary of each LTRANS partition. * lto-streamer-out.c (get_symbol_initial_value): Streaming out initial value of vtable even its class is optimized away. * lto-streamer-in.c (lto_input_tree): There might be more than one decls in dref_queue, register debuginfo for all of them. * lto-lang.c (lto_post_options): Disable full devirtualization if flag_ltrans_devirtualize is false. * tree-streamer-in.c (unpack_ts_base_value_fields): unpack value of TYPE_CXX_LOCAL for a type from streaming data. * tree-streamer-out.c (pack_ts_base_value_fields): pack value ofTYPE_CXX_LOCAL for a type into streaming data. temp --- gcc/ipa-devirt.c | 29 ++++++++++++++++++----------- gcc/ipa.c | 7 ++++++- gcc/lto-cgraph.c | 18 ++++++++++++++++++ gcc/lto-streamer-in.c | 3 +-- gcc/lto-streamer-out.c | 12 +++++++++++- gcc/lto/lto-lang.c | 6 ++++++ gcc/tree-core.h | 3 +++ gcc/tree-streamer-in.c | 11 ++++++++--- gcc/tree-streamer-out.c | 11 ++++++++--- gcc/tree.h | 5 +++++ 10 files changed, 84 insertions(+), 21 deletions(-) diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index a7d04388dab..4ff551bace8 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -216,8 +216,6 @@ struct GTY(()) odr_type_d int id; /* Is it in anonymous namespace? */ bool anonymous_namespace; - /* Set when type is not used outside of program. */ - bool whole_program_local; /* Did we report ODR violation here? */ bool odr_violated; /* Set when virtual table without RTTI prevailed table with. */ @@ -290,10 +288,18 @@ get_type_vtable (tree type) bool odr_type_d::whole_program_local_p () { - if (flag_ltrans) + if (flag_ltrans && !flag_devirtualize_fully) return false; - return whole_program_local; + if (in_lto_p) + return TYPE_CXX_LOCAL (type); + + /* Although a local class is always considered as whole program local in + LGEN stage, but may not in LTO stage if multiple duplicated primary + vtables are attached to the class due to C++ privatizing via -fno-weak. + Thus, we can not set TYPE_CXX_LOCAL flag for local class at LGEN stage + when building ORD type. */ + return anonymous_namespace || decl_function_context (TYPE_NAME (type)); } /* Return TRUE if ODR type may have any instance. */ @@ -2007,11 +2013,6 @@ get_odr_type (tree type, bool insert) else val->anonymous_namespace = 0; - if (!in_lto_p - && (val->anonymous_namespace - || decl_function_context (TYPE_NAME (type)))) - val->whole_program_local = true; - build_bases = COMPLETE_TYPE_P (val->type); insert_to_odr_array = true; *slot = val; @@ -2607,9 +2608,15 @@ identify_whole_program_local_types (void) if (multi_vtable_p) continue; + + /* Mark all equivalent types in the ODR type as whole program local, + because representative type of the ODR type at LTRANS might not + be the one at WPA. */ + FOR_EACH_VEC_ELT (*(type->types), i, equiv_type) + TYPE_CXX_LOCAL (equiv_type) = 1; } - type->whole_program_local = true; + TYPE_CXX_LOCAL (type->type) = 1; } delete no_rtti_files; @@ -2726,7 +2733,7 @@ maybe_record_node (vec &nodes, Currently we ignore these functions in speculative devirtualization. ??? Maybe it would make sense to be more aggressive for LTO even elsewhere. */ - if (!flag_ltrans + if ((!flag_ltrans || flag_devirtualize_fully) && !pure_virtual && type_in_anonymous_namespace_p (DECL_CONTEXT (target)) && (!target_node diff --git a/gcc/ipa.c b/gcc/ipa.c index 6e200a906b5..52d6a9e63be 100644 --- a/gcc/ipa.c +++ b/gcc/ipa.c @@ -268,7 +268,7 @@ can_remove_vtable_if_no_refs_p (varpool_node *vnode) if (!flag_devirtualize_fully) return true; - if (DECL_EXTERNAL (vnode->decl)) + if (DECL_EXTERNAL (vnode->decl) && !vnode->in_other_partition) return true; /* We will force generating vtables in LGEN stage even they are "unused", @@ -276,6 +276,11 @@ can_remove_vtable_if_no_refs_p (varpool_node *vnode) if (!in_lto_p && flag_generate_lto) return false; + /* All vtables seen at LTRANS stage are result of dead class elimination + at WPA, no need to prune them further. */ + if (flag_ltrans) + return false; + return true; } diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index 7c3e276a8ea..12c82eebc3f 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -859,6 +859,24 @@ compute_ltrans_boundary (lto_symtab_encoder_t in_encoder) lto_set_symtab_encoder_encode_initializer (encoder, vnode); create_references (encoder, vnode); } + + /* Add all defined vtables to streaming encoder, so that we could + reconstruct whole type inheritance graph in LTRANS as what it was in + WPA to enable late full devirtualization. + + TODO: For a partition, only need to encode a subset of vtables, not + all of them. */ + if (flag_devirtualize_fully && flag_ltrans_devirtualize && flag_wpa) + { + varpool_node *vnode; + + FOR_EACH_DEFINED_VARIABLE (vnode) + if (DECL_VIRTUAL_P (vnode->decl) && !DECL_EXTERNAL (vnode->decl) + && TYPE_CXX_LOCAL (DECL_CONTEXT (vnode->decl)) + && lto_symtab_encoder_lookup (encoder, vnode) == LCC_NOT_FOUND) + lto_symtab_encoder_encode (encoder, vnode); + } + /* Pickle in also the initializer of all referenced readonly variables to help folding. Constant pool variables are not shared, so we must pickle those too. */ diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index eb8a7dc57b0..b0902a28d59 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -1905,11 +1905,10 @@ lto_input_tree (class lto_input_block *ib, class data_in *data_in) } tree t = lto_input_tree_1 (ib, data_in, tag, 0); - if (!dref_queue.is_empty ()) + while (!dref_queue.is_empty ()) { dref_entry e = dref_queue.pop (); debug_hooks->register_external_die (e.decl, e.sym, e.off); - gcc_checking_assert (dref_queue.is_empty ()); } return t; } diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index a26d4885800..c36efb2e25c 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -437,7 +437,17 @@ get_symbol_initial_value (lto_symtab_encoder_t encoder, tree expr) scalar values. */ if (!(vnode = varpool_node::get (expr)) || !lto_symtab_encoder_encode_initializer_p (encoder, vnode)) - initial = error_mark_node; + { + /* Even when a class is optimized away, devirtualization at LTRANS + still needs to extract addresses of member virtual functions from + initial value of vtable. */ + if (flag_devirtualize_fully && flag_ltrans_devirtualize + && flag_wpa && DECL_VIRTUAL_P (expr) && !DECL_EXTERNAL (expr)) + return initial; + + initial = error_mark_node; + } + if (initial != error_mark_node) { long max_size = 30; diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c index c13c7e45ac1..a48b55f7ada 100644 --- a/gcc/lto/lto-lang.c +++ b/gcc/lto/lto-lang.c @@ -870,6 +870,12 @@ lto_post_options (const char **pfilename ATTRIBUTE_UNUSED) /* During LTRANS, we are not looking at the whole program, only a subset of the whole callgraph. */ flag_whole_program = 0; + + /* Since full devirtualization at LTRANS requires streaming extra data + on vtables, it only takes effect when flag_ltrans_devirtualize is + also on. */ + if (!flag_ltrans_devirtualize) + flag_devirtualize_fully = 0; } if (flag_wpa) diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 4498c3ad127..08d59af022b 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1328,6 +1328,9 @@ struct GTY(()) tree_base { DECL_NONALIASED in VAR_DECL + TYPE_CXX_LOCAL in + all types + deprecated_flag: TREE_DEPRECATED in diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index 984b1e269cf..1597fc102b0 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -129,10 +129,15 @@ unpack_ts_base_value_fields (struct bitpack_d *bp, tree expr) bp_unpack_value (bp, 1); TREE_ASM_WRITTEN (expr) = (unsigned) bp_unpack_value (bp, 1); if (TYPE_P (expr)) - TYPE_ARTIFICIAL (expr) = (unsigned) bp_unpack_value (bp, 1); + { + TYPE_ARTIFICIAL (expr) = (unsigned) bp_unpack_value (bp, 1); + TYPE_CXX_LOCAL (expr) = (unsigned) bp_unpack_value (bp, 1); + } else - TREE_NO_WARNING (expr) = (unsigned) bp_unpack_value (bp, 1); - TREE_NOTHROW (expr) = (unsigned) bp_unpack_value (bp, 1); + { + TREE_NO_WARNING (expr) = (unsigned) bp_unpack_value (bp, 1); + TREE_NOTHROW (expr) = (unsigned) bp_unpack_value (bp, 1); + } TREE_STATIC (expr) = (unsigned) bp_unpack_value (bp, 1); if (TREE_CODE (expr) != TREE_BINFO) TREE_PRIVATE (expr) = (unsigned) bp_unpack_value (bp, 1); diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c index 1a43534d117..7ec719ed59b 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -102,10 +102,15 @@ pack_ts_base_value_fields (struct bitpack_d *bp, tree expr) bp_pack_value (bp, (TREE_CODE (expr) != SSA_NAME ? 0 : TREE_ASM_WRITTEN (expr)), 1); if (TYPE_P (expr)) - bp_pack_value (bp, TYPE_ARTIFICIAL (expr), 1); + { + bp_pack_value (bp, TYPE_ARTIFICIAL (expr), 1); + bp_pack_value (bp, TYPE_CXX_LOCAL (expr), 1); + } else - bp_pack_value (bp, TREE_NO_WARNING (expr), 1); - bp_pack_value (bp, TREE_NOTHROW (expr), 1); + { + bp_pack_value (bp, TREE_NO_WARNING (expr), 1); + bp_pack_value (bp, TREE_NOTHROW (expr), 1); + } bp_pack_value (bp, TREE_STATIC (expr), 1); if (TREE_CODE (expr) != TREE_BINFO) bp_pack_value (bp, TREE_PRIVATE (expr), 1); diff --git a/gcc/tree.h b/gcc/tree.h index e5547e8491c..6842de7a24b 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -2254,6 +2254,11 @@ extern tree vector_element_bits_tree (const_tree); #define TYPE_FINAL_P(NODE) \ (RECORD_OR_UNION_CHECK (NODE)->base.default_def_flag) +/* If nonzero, it indicates that a C++ type (mainly polymorphic class) may + be referenced outside the program being compiled. This is used in C++ + devirtualization. */ +#define TYPE_CXX_LOCAL(NODE) (TYPE_CHECK (NODE)->base.nothrow_flag) + /* The debug output functions use the symtab union field to store information specific to the debugging format. The different debug output hooks store different types in the union field. These three -- 2.17.1