From patchwork Fri Nov 5 17:17:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 47128 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 1AF723858035 for ; Fri, 5 Nov 2021 17:19:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AF723858035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636132793; bh=jBAOhwbCgebTuWF48s5FGe6l5HqHbxzCYQpwzTJoj1s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZqDckSEYWEdlnNdJbnxb4370doBpzvpQKwvXy7Q+I6HP3q1df0JSxkGr8GgTvmYbZ N5enuZQr+yFLqr3QF2JCUPLXZxo+7hVcZepfWrDqknXSVZ+X8YjPHHe52OQfu6gMHg //71h6P+z1XUbcCXtySJCEb+DcDTjc4scs1dGQP0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 1FAF73858438 for ; Fri, 5 Nov 2021 17:17:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1FAF73858438 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-TlVAnfsAPuW3y7V_2dQUQQ-1; Fri, 05 Nov 2021 13:17:43 -0400 X-MC-Unique: TlVAnfsAPuW3y7V_2dQUQQ-1 Received: by mail-qk1-f200.google.com with SMTP id h2-20020a05620a10a200b00462c87635cdso7584972qkk.15 for ; Fri, 05 Nov 2021 10:17:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language; bh=jBAOhwbCgebTuWF48s5FGe6l5HqHbxzCYQpwzTJoj1s=; b=j4WNEAAGRnJt5+nOT5qT5urYFGegGh1NttHZQi7DLbgh+w7NQVLaBSK9Ykt2SVSR6g En2+WgDCaVS62znTfYIXfHpqR4apM0nw7RfgAzgWHJxyWZmaXlZpi89Y8tW+StRDOpra 59vg75p2RJ/eOSNxePSxM06XpaBa8w2L4uHV22kK0ZukrrAluyKxqkvE6EcIg9EQyYP3 IPuUyY6SpO3UbefoO/TdjR76qEyw/uds2Wuji3ygwDKUgwKM8MlGAA2ebuDjRiy0K1Qw aosSSTVllX+34mOZi1r0AUPpNXPWzQvb3x+ZzhKAAu8ZV0RmdZAt/PAl2s3vWYCL3SAI uoMg== X-Gm-Message-State: AOAM532GE/4fAKfPrFjS9AHUtoEQVkotXlfN7bobPpUFxpB0qG1rLfG6 tkkFErXf1gG5qafZ0gPKVuoYgHROZGB/WetmOr15ZrvkzZY+5ccGj+nk6I5gOYn4gDnZU+N6KQq BxEil8vges6qnR71tvA== X-Received: by 2002:a05:620a:414e:: with SMTP id k14mr47564524qko.349.1636132663082; Fri, 05 Nov 2021 10:17:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUKR2PEytmiHoOXd86b19kU6pVCKz4w76mJvXfvK1cDRulxC5SEm/6GsvOxx4c3RhvStRRZQ== X-Received: by 2002:a05:620a:414e:: with SMTP id k14mr47564491qko.349.1636132662858; Fri, 05 Nov 2021 10:17:42 -0700 (PDT) Received: from ?IPv6:2607:fea8:a262:5f00::e8d1? ([2607:fea8:a262:5f00::e8d1]) by smtp.gmail.com with ESMTPSA id u11sm5873277qko.119.2021.11.05.10.17.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Nov 2021 10:17:41 -0700 (PDT) To: gcc-patches Subject: [COMMITTED] PR-tree-optimization/103093 - Remove def chain import assert from GORI. Message-ID: Date: Fri, 5 Nov 2021 13:17:39 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-CA X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Andrew MacLeod via Gcc-patches From: Andrew MacLeod Reply-To: Andrew MacLeod Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" As detailed in the PR, when the IL is changing between queries, the imports and def chains of an ssa-name may change,a nd when coparing with a newly created ssa-name, certain assumptions about presence/lack of presence between lists may no longer be true. This patch simply removes the offending assert. Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew From 1f6dd5de33912c261a5003150212c290165ac1b6 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Fri, 5 Nov 2021 11:25:09 -0400 Subject: [PATCH 2/2] Remove def chain import assert from GORI. When the IL has changed, any new ssa-names import calculations may not jive with existing ssa-names, so just remove the assert. gcc/ PR tree-optimization/103093 * gimple-range-gori.cc (range_def_chain::get_imports): Remove assert. gcc/testsuite/ * gcc.dg/pr103093.c: New. --- gcc/gimple-range-gori.cc | 3 --- gcc/testsuite/gcc.dg/pr103093.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr103093.c diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc index 2e58c23216b..fb2d571ef44 100644 --- a/gcc/gimple-range-gori.cc +++ b/gcc/gimple-range-gori.cc @@ -226,9 +226,6 @@ range_def_chain::get_imports (tree name) if (!has_def_chain (name)) get_def_chain (name); bitmap i = m_def_chain[SSA_NAME_VERSION (name)].m_import; - // Either this is a default def, OR imports must be a subset of exports. - gcc_checking_assert (!get_def_chain (name) || !i - || !bitmap_intersect_compl_p (i, get_def_chain (name))); return i; } diff --git a/gcc/testsuite/gcc.dg/pr103093.c b/gcc/testsuite/gcc.dg/pr103093.c new file mode 100644 index 00000000000..f42572147ad --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr103093.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +int i_0, c_4, uc_7, func_2_c_11; + +short *func_2_ptr_10; + +void func_2() { + uc_7 = 7; + for (; uc_7 <= 60; uc_7 += 1) { + c_4 = 5; + for (; c_4 <= 76; c_4 += 1) { + func_2_ptr_10 = &i_0; /* { dg-warning "assignment to .*" } */ + if ((i_0 |= 5) > 0 ?: (60 && uc_7) | *func_2_ptr_10) + if (func_2_c_11) + for (;;) + ; + } + } +} -- 2.17.2