From patchwork Fri Oct 15 03:50:40 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: 46257 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 BFCFF3857C78 for ; Fri, 15 Oct 2021 03:51:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BFCFF3857C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634269892; bh=e0t/m4vt5I6AOCvrloxJoxXZdigoDA1baJ4XySjpvqU=; 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=Q+lR12m2mnY627lziPStTufKT6wpXp29KCLLAqOCq57D87ULzwt5QUPI+g6nAZ9bK g2XKDu+Amqi0e9BkbizT9csC1DZocDPGNfbDB7ora2EDWGvCbBEnK2rqsdfo1GSldF VP9rB7NMunfydsStjqKNFNHq7y1BI877t3yNLnww= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2121.outbound.protection.outlook.com [40.107.92.121]) by sourceware.org (Postfix) with ESMTPS id 088263857C78 for ; Fri, 15 Oct 2021 03:50:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 088263857C78 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B2cBL+9dcM00Q/gIkzAHeIa8V1bg6P7lOgckq59F2wU/SicpNdO4hDvB08XjNzfafwBJMRCgerGMSRvwzOQUVv/w2k8coviEPGdtTf3Kld6G/OtVnu8saFrT4lzYJ+WFcYioqTZDvUkFBTCZmmCkI6oayimevDXFFe4amJam9Fpz3b4UI4uLmgWunAP+eVbMMsnQKcv/PzuVsg2+HPvKWzegX/4kBae6qQopfKPHX7+mRCvW7MVFUQkB0c5Hmg2phS/hclkCskhqGzMJjTPYnNIje2XMy0jGgbQtd8HbXryTW2wKD8X8x0KXDl47GQyTYlTb9gL8xqIo+7DfAy1EsQ== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c+yNDi4HufQSc1YssbiK2JBhn/WE1jhSCDlpJWj/nNM=; b=CDD11jVsJneFClkek60PcjmpQQOyaoKrPtoM3OoDwt2lHmcd3m5PXu+rdAwx+NaYjadHFbiIwwUcK5zcyZze0YF9zIq3pT/iYMqqyPOhcTyzk+q8mCJSMIPUX0ZQbE78cgH43lIEhZOzXp0gkz9SiU2sM+F/g6ED4vTa7NXvQ8I6GcVdeec4BfA18jpwlQ6CU0xwyDAzOzZabt/Kz8V7paKUguaxc/XGdG3KEhzYonvGcq/ANF/81cNEvDsnVzuMkiNZhFTZcA7hZEap05d4oxOPP5RPn/VkuAiR1kkmoqIw66BURVuJq7HOJGYadiZSrirVV+3oVpx2Sl8gCQs9yA== 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 SN6PR01MB3920.prod.exchangelabs.com (2603:10b6:805:27::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Fri, 15 Oct 2021 03:50:43 +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.4608.016; Fri, 15 Oct 2021 03:50:40 +0000 To: Jan Hubicka , "mjambor@suse.cz" , Richard Biener , "gcc-patches@gcc.gnu.org" Subject: PING^2: [PATCH/RFC 2/2] WPD: Enable whole program devirtualization at LTRANS Thread-Topic: PING^2: [PATCH/RFC 2/2] WPD: Enable whole program devirtualization at LTRANS Thread-Index: AQHXwXfShnl5jTEumUC9XjfU/bVvBQ== Date: Fri, 15 Oct 2021 03:50:40 +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: d5636813-129d-33a1-02f8-c2ab2ca0c0ba x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 38afc2d3-55fb-4b3f-7f62-08d98f8ef506 x-ms-traffictypediagnostic: SN6PR01MB3920: 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: X1nVhA7l/dDT/xcEZIiZDhX0J0RwMwaGYhocma54YIC1wBJCI+JdrQGylk7V+a0jHIWX/dwJ7tH7c/lxVm+rk1X565AZoj21vZpEcY99p32wzalivNQb9PM1ieDwRqsG5KZ6K6xlgm3B4T1PcC+TWia864F+bBYaMx+vwMn9mV+HcOPpZlVV2OtdlzsUju41gvvNRcuVHET4Z4g0kgccuU2OTAqNvZhkf79gWfN15JyxQemRO3cm64pnArD7gGsp+O5/vl+cgAVHjQSBn2BjykITYhq4DBX3Ym6ROJfPJOF6HtwIza70WumMgGOv77CXBTKijo54ImhRLuVSCLz7L1bBepKzpf7s2P9WlRvasPfGQqasqcy+T6oeL89h2GjUT2b91UK4g2vmzF0T9dx/EfYFWQjMvSx/CSaW2UhgQQYYU2JOo0ocCWEeF2JGXUJvTt+5iHIzyXj8bYf0Zztn8IkqBmNgcmBJrQh1cGRHKaCVH6PJX86UmrPD6nI4aH8W8GjAj3ovisH64Q8Czlbxr0P9JF8w38t4XYyWxZ0hlCx0rjdgQ8BK53scaEPStuaIBZt1JDWgQ1lppJLbbNlW2wlh47L6SeHZRzLtZvQUjIeV2NfAPRisLHUwhF9ZV8onFMm7LSOXL/Zaq1CjoM1Sa3axPdWJbxk67GCWPVk0g1mTybkuBXDwkS4Vs0lJaOJ7ldN06X3ecXlkY74LYLJWiqv8VyeLzTjdjgzJ15ABwN4= 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)(52536014)(122000001)(8936002)(8676002)(86362001)(316002)(110136005)(2906002)(38100700002)(83380400001)(33656002)(508600001)(53546011)(6506007)(66946007)(186003)(5660300002)(71200400001)(99936003)(7696005)(9686003)(66476007)(91956017)(26005)(55016002)(76116006)(66446008)(38070700005)(64756008)(66556008)(81973001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?5ehHDLN+plGUSilpyMgJ4iS?= =?iso-8859-1?q?hjhOPkWWJQXBj2i+acDa6DaNXbwc6EKQR/tWHXnFI4PmK9ecB1R53sREkTj/?= =?iso-8859-1?q?K5pyNC0jsaViZY+OBUCtMbaoT57eRX7Hg9FkKSX68VfJfGls2XnIxyajAsRi?= =?iso-8859-1?q?zIx0dXvq23KGSMignO9Z0OUBxLWO9CjFxDmzcXc6YfA6YRz0ErVwJV4FEm8A?= =?iso-8859-1?q?9uHxCAFBTTWPDFS2m47ojzSGT283U18cqvRSfBjFy6CmSWvbyuVKjP4oYN6O?= =?iso-8859-1?q?GGRh9NK27KFIaodYXP78yMT5D5JPzmTSqK+NZ3jF+sbwRUiQxoaWtM87KICE?= =?iso-8859-1?q?9OFHrNFpe79dJlW501KQqVy19C1e6P9b6+1dXry3ZnMhH0tP0yA1ShGY47Wf?= =?iso-8859-1?q?1jShcn4SXFmEd5rcocYugARIWtJMXSuKmssmbV4uCQDHPQipsJ3H1C5dSKlI?= =?iso-8859-1?q?FQoOey8j0DA8y0f1N46i8c8MjQDk0tyfFdnO7kpNN2WFgXJ9CmtEtP+Kgx1L?= =?iso-8859-1?q?CC8ugGHyDqBzVdQNd0BL9hTTuu0k3SxNZR1H/AWt2gW7x6sYnKuhi+dyPp0v?= =?iso-8859-1?q?+7S94kq+F3YOF4tFJDJ5GCJwTJ+s54IYxxrU7Myxzm//d9BItqayR7ztQPz2?= =?iso-8859-1?q?CLcWXdhfmtWn0sKmQrs/xNk8RAi36yq3l1z3KuyhkeRD/yXi/R9Y7U2GQkWN?= =?iso-8859-1?q?KIjyyw7aXiH4UoJEapZh5dQvXL7SeqwG9CxVV82SjgtiohyYBXx/yWyFzWbK?= =?iso-8859-1?q?8e7Lq6bBNsRM6bt/EbD4pd8TG2Dex7gc4/0TYKWFJKHDYx8PJir3vDDWHQaC?= =?iso-8859-1?q?2iuWEPaPCqanpM71SqiM2Ks8C+AfFkBD0BMwQ4JUh/VB2UUbl1XXgWgjVEzT?= =?iso-8859-1?q?mUTfPfMwRxagyKLUCpRKj67ufrHI0XFgCvzeYrsQubPcSnwAcHtbBu9c5zJt?= =?iso-8859-1?q?UnKA4MmYu0W4KNhjbN8dVfAyq/RVOaSnykmipLyFC/pR8zFoVgCVeRyznfzV?= =?iso-8859-1?q?vz81CwQvQfynw2DWJpxADId37Z+KxnlfhlGqyGUFg3pdDU/tzZ5BW36dW0Gs?= =?iso-8859-1?q?7p2GDbPAXGy1A9aapqYCbRtc8I9LHZphnbQUkrbrajYMIxG7Pwg0j8/mmr8a?= =?iso-8859-1?q?/boxcJyFZe4d5AJmtPAz36vs4bke5hEnPBGcX3M4A+XB6w/JURd6V2qGQz2L?= =?iso-8859-1?q?yNWIZ6LvS4mxcPWwZtRKqXMHqpUlI6mrX3ppcZTeTACf38ROBiCUgK7vxXxA?= =?iso-8859-1?q?zOOvOtqLiAGpC4YUfDB+QSWOMzx79yLUIldqYHoq0K0Gw9vjfyku3Ug4+ZNT?= =?iso-8859-1?q?yTEyD6OoN43XaM83BS7324Gu7fb/3cheEk0AWTC0=3D?= 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: 38afc2d3-55fb-4b3f-7f62-08d98f8ef506 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2021 03:50:40.7618 (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: b9/QRQaXqfk1XyrhA7lrDTgxiPQlYrRdRoELog/0t8lhlWHqcDcM77CQAZsm9N+vOaBMUscYabz8Q6ZE7xouKkP4EKt0AirwptqUiQkKoow= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR01MB3920 X-Spam-Status: No, score=-11.1 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" Thanks, Feng From 624aef44d72799ae488a431b4dce730f4b0fc28e 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. --- gcc/ipa-devirt.c | 33 ++++++++++++++++++--------------- gcc/ipa.c | 7 ++++++- gcc/lto-cgraph.c | 19 +++++++++++++++++++ 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 | 16 +++++++++++++--- gcc/tree.h | 5 +++++ 10 files changed, 90 insertions(+), 25 deletions(-) diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 284c449c6c1..bb929f016f8 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,15 @@ get_type_vtable (tree type) bool odr_type_d::whole_program_local_p () { - if (flag_ltrans) - 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 +2010,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; @@ -2630,17 +2628,22 @@ identify_whole_program_local_types (void) if (multi_vtable_p) continue; - if (is_final) + /* 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; + /* If no derivation, whole program local type is marked as FINAL, which could help devirtualization at LTRANS even there will be more than one partitions. */ - FOR_EACH_VEC_ELT (*(type->types), i, equiv_type) + if (is_final) TYPE_FINAL_P (equiv_type) = 1; } } - type->whole_program_local = true; + TYPE_CXX_LOCAL (type->type) = 1; if (is_final) TYPE_FINAL_P (type->type) = 1; } @@ -2759,7 +2762,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..fd272c4ffdf 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -859,6 +859,25 @@ 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 complete class hierarchy at LTRANS for any whole-program + local type as what it was at WPA to enable late full devirtualization. + + TODO: For a partition, only need to encode a subset of vtables, not all + of them. Some class hierarchy that is not referenced in the partition + could be excluded. */ + 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..151df839886 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -102,10 +102,20 @@ 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); + /* Clear whole-program local flag of type if full devirtualization is + disabled at LTRANS stage. */ + if (flag_wpa && (!flag_devirtualize_fully || !flag_ltrans_devirtualize)) + bp_pack_value (bp, 0, 1); + else + 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