From patchwork Mon May 13 17:49:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 1934769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IXTQYAfs; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdRq30C7dz20d6 for ; Tue, 14 May 2024 03:50:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 286EA3858432 for ; Mon, 13 May 2024 17:50:34 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTPS id B5A4D3870895 for ; Mon, 13 May 2024 17:49:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5A4D3870895 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B5A4D3870895 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715622568; cv=none; b=vIULgczSpNsj04CxeEkxbi4s+Egfal+Mge57qujx4lu8U2HiyXUXH7P7YXVJ5kz1jVf+EMcoUGAdka1V0PqY+cy6ses2rjGmZ3gqa3T9fHJ5+qwiDRtCspKE2CGwIW6yAtdYJFelvisrGpXBjtEZMKhJdWihlWiwaqZCmQQh5jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715622568; c=relaxed/simple; bh=1ca/pkT1ENsTgtu9X3LY1RE01TfDz+wl8vdqlp8FULI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=o6obzuiw+o0b/Gkj9Ib/P9QiduPImsOXgWD44oGya8lpTquF/UxcG1PvlzdgQ0K3geH3XFMnTeUmJLnT7pgq8x6Mk0sulAV3yBKfYbonwGOS6l7ybdAxb4oVdMZp2c3pZH4HKjQSMYc1vyQDV1qK6mVSC1kRWEQRQ0pfrs2dt4w= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715622560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=e8HDyeWLrHR09jsMk4Q6ke5ZiaZn+zUNF6L6pkd0P7Q=; b=IXTQYAfsGQoh4M8LJegDo3H6CFB+rmvhCR6FqYSnhuDibL1NSFh7PUjxFKsf1dkidsdoW/ 158ZJAC3i29L8xOVyWVcotzAUdHsMdQqu9skMZ6SFb40YyU39dax/maVtGTrocIJ0H6a3o XK9ZYW7dn1HS1p/aQq7b0M5sZskkkoQ= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-527-tJ0Cc_NyOTeW7obPDRTb1Q-1; Mon, 13 May 2024 13:49:18 -0400 X-MC-Unique: tJ0Cc_NyOTeW7obPDRTb1Q-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-43dfa95d4a7so44416221cf.3 for ; Mon, 13 May 2024 10:49:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715622557; x=1716227357; h=in-reply-to:references:to:from:content-language:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=g/zD2G+LgAw9NuGvG9jhSpXb/4/mTrKOl1SRqTlyEPY=; b=xHSiKeuFz1OMtMsvWCR84qgO7VrbvpULyOr7Xeuybqm2ctCT3vVmwMsxUQOs5Q7EMn v7ucyJI+t9WQtiy/8zlGyo9qd//VI6JDKgtPYz50czOS7S+8YqVZb6I0CRdbQcviPz5Z 21C7ltwdV4OHbjW+JdANjEcCuo+f5oMvjZodkrsqRKBoVpDf3cr8PAoOImFRHQYwm+vw eSXc2/PsXZQ3laQ6I50/8sJ8H/CRuO8S+saOrc1F8/859KESO5uScfj5tixHwzJY9LcH MtATf7s7/mpdKeiCArtKKUbYqX0BzL2Y529Ub9fmxnQvcRrGjNBDD8A1hZXNYsx4n1Tk wRPA== X-Gm-Message-State: AOJu0YzpCunLl0eviSg2g+h9/0qBgAQpYvSeYSSQH0/XhL/mnbTkevjo Csj1H2WK09iHWrK1+fkfwOpVKUfxRtvDnpI4x8Cq4DNUt8FrJlL3LOGbOXJqhL9FnKBb2qU2uCJ go5En+FDMHGn5wokz5932UIF6JNQpol0T6i+kOUO5jFJa7wh2TpOOYtQEEKEqyCzfogjCkuu5Ex jMXIc+McGlY+og8uqa+1Bk9oChb3I3ZXwCbaEhjsY= X-Received: by 2002:a05:6214:3a8b:b0:6a0:89ac:f9b with SMTP id 6a1803df08f44-6a168213864mr126288166d6.31.1715622557565; Mon, 13 May 2024 10:49:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbvfQ1yBjIb48sX1f+7/j4T9dtXV2MxD2fThGSg4+1HcjHbkN1CQcdBQrm7QnN18R5j6S+XQ== X-Received: by 2002:a05:6214:3a8b:b0:6a0:89ac:f9b with SMTP id 6a1803df08f44-6a168213864mr126288006d6.31.1715622557090; Mon, 13 May 2024 10:49:17 -0700 (PDT) Received: from ?IPV6:2607:fea8:51db:5900::9ff8? ([2607:fea8:51db:5900::9ff8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6a346a382ffsm1295846d6.10.2024.05.13.10.49.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 May 2024 10:49:16 -0700 (PDT) Message-ID: <483435e7-95cd-4430-90d5-934fa3322885@redhat.com> Date: Mon, 13 May 2024 13:49:15 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [COMMITTED][GCC12] Backport of 111009 patch. From: Andrew MacLeod To: gcc-patches References: In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-13.0 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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Same patch for gcc12. bootstraps and passes all tests on x86_64-pc-linux-gnu On 5/9/24 10:32, Andrew MacLeod wrote: > As requested, backported the patch for 111009 to resolve incorrect > ranges from addr_expr and committed to GCC 13 branch. > > bootstraps and passes all tests on x86_64-pc-linux-gnu > > Andrew commit b5d079c37e9eee15c0bfe34ffcae31e551192777 Author: Andrew MacLeod Date: Fri May 10 13:56:01 2024 -0400 Fix range-ops operator_addr. Lack of symbolic information prevents op1_range from being able to draw the same conclusions as fold_range can. PR tree-optimization/111009 gcc/ * range-op.cc (operator_addr_expr::op1_range): Be more restrictive. * value-range.h (contains_zero_p): New. gcc/testsuite/ * gcc.dg/pr111009.c: New. diff --git a/gcc/range-op.cc b/gcc/range-op.cc index bf95f5fbaa1..2e0d67b70b6 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -3825,7 +3825,17 @@ operator_addr_expr::op1_range (irange &r, tree type, const irange &op2, relation_kind rel ATTRIBUTE_UNUSED) const { - return operator_addr_expr::fold_range (r, type, lhs, op2); + if (empty_range_varying (r, type, lhs, op2)) + return true; + + // Return a non-null pointer of the LHS type (passed in op2), but only + // if we cant overflow, eitherwise a no-zero offset could wrap to zero. + // See PR 111009. + if (!contains_zero_p (lhs) && TYPE_OVERFLOW_UNDEFINED (type)) + r = range_nonzero (type); + else + r.set_varying (type); + return true; } diff --git a/gcc/testsuite/gcc.dg/pr111009.c b/gcc/testsuite/gcc.dg/pr111009.c new file mode 100644 index 00000000000..3accd9ac063 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr111009.c @@ -0,0 +1,38 @@ +/* PR tree-optimization/111009 */ +/* { dg-do run } */ +/* { dg-options "-O3 -fno-strict-overflow" } */ + +struct dso { + struct dso * next; + int maj; +}; + +__attribute__((noipa)) static void __dso_id__cmp_(void) {} + +__attribute__((noipa)) +static int bug(struct dso * d, struct dso *dso) +{ + struct dso **p = &d; + struct dso *curr = 0; + + while (*p) { + curr = *p; + // prevent null deref below + if (!dso) return 1; + if (dso == curr) return 1; + + int *a = &dso->maj; + // null deref + if (!(a && *a)) __dso_id__cmp_(); + + p = &curr->next; + } + return 0; +} + +__attribute__((noipa)) +int main(void) { + struct dso d = { 0, 0, }; + bug(&d, 0); +} + diff --git a/gcc/value-range.h b/gcc/value-range.h index d4cba22d540..22f5fc68d7c 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -605,6 +605,16 @@ irange::normalize_kind () } } +inline bool +contains_zero_p (const irange &r) +{ + if (r.undefined_p ()) + return false; + + tree zero = build_zero_cst (r.type ()); + return r.contains_p (zero); +} + // Return the maximum value for TYPE. inline tree