From patchwork Sun Aug 3 14:04:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 376030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F212D14009B for ; Mon, 4 Aug 2014 00:04:56 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=default; b=FlpIjgJ1iF9c7t1PoPwKZFGcNE2gC bMbb/qfDPvDUVwkR195VosM99mo1lsOzBXbICyenN/fIPtmqLLo5wW+/R3zGWTv3 w+Ugox7mfMeI2Vffr26IL5SanbRB4mhay0emDpxBrVlzPMfb+ES8DI4o0U0Eb48g OwhGSfipIzP6OA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:references:date:in-reply-to:message-id:mime-version :content-type; s=default; bh=AbfRkon4qSQZzeLJxV0C9EnjzdU=; b=ND5 0BHQElaatIAM8Vq5fAAn5k6o+TF0C0c6PuP/Fezu1PlCbp7IRTCwUsIWXNgRp0dF 9Vj0XwjK8FRCO2WcpLfWToHeoPJ7z5WQHODp5vPOq+uhwluPBcliVZAzwMwJa5Sk pnKJNN8WH4fZO9S/l8CF3RBoVWaGMWXuZMgsAQLY= Received: (qmail 2712 invoked by alias); 3 Aug 2014 14:04:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 2699 invoked by uid 89); 3 Aug 2014 14:04:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-we0-f169.google.com Received: from mail-we0-f169.google.com (HELO mail-we0-f169.google.com) (74.125.82.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 03 Aug 2014 14:04:49 +0000 Received: by mail-we0-f169.google.com with SMTP id u56so6388887wes.28 for ; Sun, 03 Aug 2014 07:04:46 -0700 (PDT) X-Received: by 10.180.81.234 with SMTP id d10mr22483546wiy.79.1407074686096; Sun, 03 Aug 2014 07:04:46 -0700 (PDT) Received: from localhost ([95.145.138.172]) by mx.google.com with ESMTPSA id pm3sm3302954wjb.28.2014.08.03.07.04.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Aug 2014 07:04:45 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [PATCH 20/50] dwarf2out.c:resolve_one_addr References: <87y4v5d77q.fsf@googlemail.com> Date: Sun, 03 Aug 2014 15:04:45 +0100 In-Reply-To: <87y4v5d77q.fsf@googlemail.com> (Richard Sandiford's message of "Sun, 03 Aug 2014 14:38:01 +0100") Message-ID: <87k36pacua.fsf@googlemail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 gcc/ * dwarf2out.c (resolve_one_addr): Remove unused data parameter. Return a bool, inverting the result so that 0/false means "not ok". Use FOR_EACH_SUBRTX_PTR instead of for_each_rtx to iterate over subrtxes of a CONST. (mem_loc_descriptor, add_const_value_attribute) (resolve_addr_in_expr): Update calls accordingly. Index: gcc/dwarf2out.c =================================================================== --- gcc/dwarf2out.c 2014-08-03 11:25:25.454107831 +0100 +++ gcc/dwarf2out.c 2014-08-03 11:25:25.747110728 +0100 @@ -3156,7 +3156,7 @@ static dw_loc_descr_ref multiple_reg_loc static dw_loc_descr_ref based_loc_descr (rtx, HOST_WIDE_INT, enum var_init_status); static int is_based_loc (const_rtx); -static int resolve_one_addr (rtx *, void *); +static bool resolve_one_addr (rtx *); static dw_loc_descr_ref concat_loc_descriptor (rtx, rtx, enum var_init_status); static dw_loc_descr_ref loc_descriptor (rtx, enum machine_mode mode, @@ -13240,7 +13240,7 @@ mem_loc_descriptor (rtx rtl, enum machin break; case CONST_STRING: - resolve_one_addr (&rtl, NULL); + resolve_one_addr (&rtl); goto symref; default: @@ -15295,7 +15295,7 @@ add_const_value_attribute (dw_die_ref di if (dwarf_version >= 4 || !dwarf_strict) { dw_loc_descr_ref loc_result; - resolve_one_addr (&rtl, NULL); + resolve_one_addr (&rtl); rtl_addr: loc_result = new_addr_loc_descr (rtl, dtprel_false); add_loc_descr (&loc_result, new_loc_descr (DW_OP_stack_value, 0, 0)); @@ -23127,11 +23127,11 @@ move_marked_base_types (void) } /* Helper function for resolve_addr, attempt to resolve - one CONST_STRING, return non-zero if not successful. Similarly verify that + one CONST_STRING, return true if successful. Similarly verify that SYMBOL_REFs refer to variables emitted in the current CU. */ -static int -resolve_one_addr (rtx *addr, void *data ATTRIBUTE_UNUSED) +static bool +resolve_one_addr (rtx *addr) { rtx rtl = *addr; @@ -23144,15 +23144,15 @@ resolve_one_addr (rtx *addr, void *data = build_array_type (char_type_node, build_index_type (tlen)); rtl = lookup_constant_def (t); if (!rtl || !MEM_P (rtl)) - return 1; + return false; rtl = XEXP (rtl, 0); if (GET_CODE (rtl) == SYMBOL_REF && SYMBOL_REF_DECL (rtl) && !TREE_ASM_WRITTEN (SYMBOL_REF_DECL (rtl))) - return 1; + return false; vec_safe_push (used_rtx_array, rtl); *addr = rtl; - return 0; + return true; } if (GET_CODE (rtl) == SYMBOL_REF @@ -23161,17 +23161,21 @@ resolve_one_addr (rtx *addr, void *data if (TREE_CONSTANT_POOL_ADDRESS_P (rtl)) { if (!TREE_ASM_WRITTEN (DECL_INITIAL (SYMBOL_REF_DECL (rtl)))) - return 1; + return false; } else if (!TREE_ASM_WRITTEN (SYMBOL_REF_DECL (rtl))) - return 1; + return false; } - if (GET_CODE (rtl) == CONST - && for_each_rtx (&XEXP (rtl, 0), resolve_one_addr, NULL)) - return 1; + if (GET_CODE (rtl) == CONST) + { + subrtx_ptr_iterator::array_type array; + FOR_EACH_SUBRTX_PTR (iter, array, &XEXP (rtl, 0), ALL) + if (!resolve_one_addr (*iter)) + return false; + } - return 0; + return true; } /* For STRING_CST, return SYMBOL_REF of its constant pool entry, @@ -23283,7 +23287,7 @@ resolve_addr_in_expr (dw_loc_descr_ref l switch (loc->dw_loc_opc) { case DW_OP_addr: - if (resolve_one_addr (&loc->dw_loc_oprnd1.v.val_addr, NULL)) + if (!resolve_one_addr (&loc->dw_loc_oprnd1.v.val_addr)) { if ((prev == NULL || prev->dw_loc_opc == DW_OP_piece @@ -23302,7 +23306,7 @@ resolve_addr_in_expr (dw_loc_descr_ref l || (loc->dw_loc_opc == DW_OP_GNU_const_index && loc->dtprel)) { rtx rtl = loc->dw_loc_oprnd1.val_entry->addr.rtl; - if (resolve_one_addr (&rtl, NULL)) + if (!resolve_one_addr (&rtl)) return false; remove_addr_table_entry (loc->dw_loc_oprnd1.val_entry); loc->dw_loc_oprnd1.val_entry = @@ -23312,7 +23316,7 @@ resolve_addr_in_expr (dw_loc_descr_ref l case DW_OP_const4u: case DW_OP_const8u: if (loc->dtprel - && resolve_one_addr (&loc->dw_loc_oprnd1.v.val_addr, NULL)) + && !resolve_one_addr (&loc->dw_loc_oprnd1.v.val_addr)) return false; break; case DW_OP_plus_uconst: @@ -23330,7 +23334,7 @@ resolve_addr_in_expr (dw_loc_descr_ref l break; case DW_OP_implicit_value: if (loc->dw_loc_oprnd2.val_class == dw_val_class_addr - && resolve_one_addr (&loc->dw_loc_oprnd2.v.val_addr, NULL)) + && !resolve_one_addr (&loc->dw_loc_oprnd2.v.val_addr)) return false; break; case DW_OP_GNU_implicit_pointer: @@ -23587,7 +23591,7 @@ resolve_addr (dw_die_ref die) break; case dw_val_class_addr: if (a->dw_attr == DW_AT_const_value - && resolve_one_addr (&a->dw_attr_val.v.val_addr, NULL)) + && !resolve_one_addr (&a->dw_attr_val.v.val_addr)) { if (AT_index (a) != NOT_INDEXED) remove_addr_table_entry (a->dw_attr_val.val_entry);