From patchwork Wed Nov 13 23:14:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Stump X-Patchwork-Id: 291076 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6CC4F2C007B for ; Thu, 14 Nov 2013 10:15:10 +1100 (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 :content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; q=dns; s=default; b=mAGzrLHvlQIuRvKwrq1DScsacQ VlTQIijwinJ3vsXir3rfkv9pgyZWUJwzcGRkD1S+vXKF2ROvHGbwIZh2LwQqm21V SlPDaq3gS41QBqjkRyXGJ7lwLoGSJVyHmaa6RIjzSfO8vcHXXZTajMqlnegGWwjJ RCzlARCv+GhcmSeuQ= 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 :content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; s=default; bh=ZEd5PSxPBOKtnA9S2vsskCmAFKw=; b= udqXGeprkr9DSdfLN5VPA91J1tFZvKWep3fkbVUuXw6n6S1BV55Nmo2bxCW5rcnx HvSXbtYNTYka81hakI1CBctvjCCX2wfyXeKOhXzVN7UCT6YzkIwoN/Dvy2ntVFXH m4g6MAwLSbk1DhMC3DkRVxj3ce7E+nnpKYTMXkajMJ0= Received: (qmail 25420 invoked by alias); 13 Nov 2013 23:14:58 -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 25409 invoked by uid 89); 13 Nov 2013 23:14:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.6 required=5.0 tests=AWL, BAYES_40, FREEMAIL_FROM, RDNS_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: qmta11.emeryville.ca.mail.comcast.net Received: from Unknown (HELO qmta11.emeryville.ca.mail.comcast.net) (76.96.27.211) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Nov 2013 23:14:56 +0000 Received: from omta19.emeryville.ca.mail.comcast.net ([76.96.30.76]) by qmta11.emeryville.ca.mail.comcast.net with comcast id p9Ub1m0051eYJf8ABBEoJU; Wed, 13 Nov 2013 23:14:48 +0000 Received: from up.mrs.kithrup.com ([24.4.193.8]) by omta19.emeryville.ca.mail.comcast.net with comcast id pBEn1m00x0BKwT401BEobv; Wed, 13 Nov 2013 23:14:48 +0000 From: Mike Stump Subject: [wide-int] Fix memory stomper in dwarf Message-Id: <13FA1BDF-FEF1-4F71-AA18-780ACAF50077@comcast.net> Date: Wed, 13 Nov 2013 15:14:47 -0800 To: " Patches" Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) X-IsSubscribed: yes This fixes a memory stomper that Kenny found. This also improves the code in the face of vector of partial ints... diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index acee2000..ab8852f 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3163,7 +3163,7 @@ static void add_AT_location_description (dw_die_ref, enum dwarf_attribute, static void add_data_member_location_attribute (dw_die_ref, tree); static bool add_const_value_attribute (dw_die_ref, rtx); static void insert_int (HOST_WIDE_INT, unsigned, unsigned char *); -static void insert_wide_int (const wide_int &, unsigned char *); +static void insert_wide_int (const wide_int &, unsigned char *, int); static void insert_float (const_rtx, unsigned char *); static rtx rtl_for_decl_location (tree); static bool add_location_or_const_value_attribute (dw_die_ref, tree, bool, @@ -13464,7 +13464,7 @@ loc_descriptor (rtx rtl, enum machine_mode mode, for (i = 0, p = array; i < length; i++, p += elt_size) { rtx elt = CONST_VECTOR_ELT (rtl, i); - insert_wide_int (std::make_pair (elt, imode), p); + insert_wide_int (std::make_pair (elt, imode), p, elt_size); } break; @@ -15103,18 +15103,29 @@ extract_int (const unsigned char *src, unsigned int size) /* Writes wide_int values to dw_vec_const array. */ static void -insert_wide_int (const wide_int &val, unsigned char *dest) +insert_wide_int (const wide_int &val, unsigned char *dest, int elt_size) { int i; + if (elt_size <= HOST_BITS_PER_WIDE_INT/BITS_PER_UNIT) + { + insert_int ((HOST_WIDE_INT) val.elt (0), elt_size, dest); + return; + } + + // We'd have to extend this code to support odd sizes. + gcc_assert (elt_size % (HOST_BITS_PER_WIDE_INT/BITS_PER_UNIT) == 0); + + int n = elt_size / (HOST_BITS_PER_WIDE_INT/BITS_PER_UNIT); + if (WORDS_BIG_ENDIAN) - for (i = (int)get_full_len (val) - 1; i >= 0; i--) + for (i = n - 1; i >= 0; i--) { insert_int ((HOST_WIDE_INT) val.elt (i), sizeof (HOST_WIDE_INT), dest); dest += sizeof (HOST_WIDE_INT); } else - for (i = 0; i < (int)get_full_len (val); i++) + for (i = 0; i < n; i++) { insert_int ((HOST_WIDE_INT) val.elt (i), sizeof (HOST_WIDE_INT), dest); dest += sizeof (HOST_WIDE_INT); @@ -15207,7 +15218,7 @@ add_const_value_attribute (dw_die_ref die, rtx rtl) for (i = 0, p = array; i < length; i++, p += elt_size) { rtx elt = CONST_VECTOR_ELT (rtl, i); - insert_wide_int (std::make_pair (elt, imode), p); + insert_wide_int (std::make_pair (elt, imode), p, elt_size); } break;