From patchwork Wed Dec 2 15:30:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1409796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MFA9zsKT; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CmNGh6Bs5z9sRK for ; Thu, 3 Dec 2020 02:31:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 69C5E395C867; Wed, 2 Dec 2020 15:31:03 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by sourceware.org (Postfix) with ESMTPS id 35E3C395C866 for ; Wed, 2 Dec 2020 15:31:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 35E3C395C866 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qk1-x730.google.com with SMTP id n132so1554139qke.1 for ; Wed, 02 Dec 2020 07:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=Gnnz+AoJC+bM+geEDsk61go5wyrz6nT1G7sAJkkSUkM=; b=MFA9zsKTjmJVXW89l1mUGgLuZchIC9hzdLwd2fKAc72D1ggb3Ni7eBa5Jbt4WQTWoD LdPg5E2BEIwnjTC5f5AXTM9JxrrABeTwplUhUZi4YN6v0Z5q4jCBPugAR0GLUkQWggdf 4hKhU4j+hEo7sqaDoT5fWgHMmFyOb0Bo1BbXPBraq0Up5a1DlRO1DoS8UJ9I18tNx9+i 7QJ8ugFii30Sk+J3AoU37lxdbDDd8VGv1jGjUbrfJHwDiShs15aXfg5GawwZ9o05UWOM qKQ2650hH80WjQgTn9NkbMWz92UBvnJ8mQiF+upK1y0HycUuPCa+qWSEBtIh7xuHR/9U bweg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=Gnnz+AoJC+bM+geEDsk61go5wyrz6nT1G7sAJkkSUkM=; b=BYJ0Zlh6TyjSLSHT7zjsRxgRWaggTG/lP3iL7TeRV+KOKYwls20Ax9YMKS0xIgwMBK zAl7nQM2VYF/aRtdmlVSR4hVyLXH1+cZpPeWq7Pnd370pKSQpkD7y9m/jKOEnpiC+jPI oYrTisHD2nhPWlNVRPpOzSwwq82lkKP5+vtu2MJnuQ8cQ3Mw2HDSTqdHzuMq73qrrTTB qphtQRhd55Ai2itgGGlh0UEb6ztC84kJ3gdWTAwqSFive8Ji5uDRZnNn8q50NLt9txMC wPoSoC8gRkMdCkhffZKT4bfJiNfwBff14LmrRKgaQIKpvY/bvBAmbVPJU9gqi3nAVtCk os3g== X-Gm-Message-State: AOAM532zZZySMIU/pFoatvFIQjgbovmfsnpr6GIhTQfJj8QK9AzKd6GX NowwWp2BQED8HNYehWYWfc4= X-Google-Smtp-Source: ABdhPJz4AR8pDk1d+UxsG4t2Dko4sBa9igwhFqBx2mlv68j+JO90avZIP5hJ+jETVERIWnoYBRlfIw== X-Received: by 2002:a05:620a:16cd:: with SMTP id a13mr2978605qkn.11.1606923060284; Wed, 02 Dec 2020 07:31:00 -0800 (PST) Received: from ?IPv6:2620:10d:c0a8:1102:fd8c:7733:5cca:4143? ([2620:10d:c091:480::1:3c95]) by smtp.googlemail.com with ESMTPSA id i7sm1956891qkl.94.2020.12.02.07.30.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Dec 2020 07:30:59 -0800 (PST) To: GCC Patches From: Nathan Sidwell Subject: c++: Fix bootstrap Message-ID: Date: Wed, 2 Dec 2020 10:30:56 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" I'm not sure why this didn't pop up on the earlier bootstrap. Anyway, fixed thusly. I made the prefix for dumping a binding-vector slightly too small. Fixed thusly. gcc/cp/ * ptree.c (cxx_print_xnode): Increase binding-vector prefix size. diff --git i/gcc/cp/ptree.c w/gcc/cp/ptree.c index 1ee107f23cc..f8d22082ba7 100644 --- i/gcc/cp/ptree.c +++ w/gcc/cp/ptree.c @@ -259,15 +259,15 @@ cxx_print_xnode (FILE *file, tree node, int indent) for (unsigned ix = 0; ix != len; ix++) { binding_cluster *cluster = &BINDING_VECTOR_CLUSTER (node, ix); - char pfx[20]; + char pfx[24]; for (unsigned jx = 0; jx != BINDING_VECTOR_SLOTS_PER_CLUSTER; jx++) if (cluster->indices[jx].span) { int len = sprintf (pfx, "module:%u", cluster->indices[jx].base); if (cluster->indices[jx].span > 1) - len - += sprintf (&pfx[len], "(+%u)", cluster->indices[jx].span); + len += sprintf (&pfx[len], "(+%u)", + cluster->indices[jx].span); len += sprintf (&pfx[len], " cluster:%u/%u", ix, jx); binding_slot &slot = cluster->slots[jx]; if (slot.is_lazy ())