From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6773F3858418 for ; Mon, 1 May 2023 06:29:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6773F3858418 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682922555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rHjiGsLCYOVg7RTp9njF6HvNsWkV5AFtemgbRKPYIxE=; b=N9j4W8i6I9D3qTvZRkHoXHGDiMcSEGy+VmdyDM7wYwYYBJ4L+SPmL3x4U+pK9Z1F+cBLdZ bkAFBUl0BNWg8ZnShW+mIYAgH1NJLPuZgC+163mNF1GGbNnAjBr8PP+wXgQSBBsw4s4tXM tEMQA0vVlVAIEcvzNV6nclKWm2rUlkU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-157-QE9IlurnNKmIa6dmpv_FOA-1; Mon, 01 May 2023 02:29:13 -0400 X-MC-Unique: QE9IlurnNKmIa6dmpv_FOA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FF1A811E7D for ; Mon, 1 May 2023 06:29:13 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 485FE492C13; Mon, 1 May 2023 06:29:13 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 3416TCC4564861 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 1 May 2023 08:29:12 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 3416TCNF564860; Mon, 1 May 2023 08:29:12 +0200 From: Aldy Hernandez To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Merge irange::union/intersect into irange_union/intersect. Date: Mon, 1 May 2023 08:29:00 +0200 Message-Id: <20230501062906.564803-6-aldyh@redhat.com> In-Reply-To: <20230501062906.564803-1-aldyh@redhat.com> References: <20230501062906.564803-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.4 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_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: gcc/ChangeLog: * value-range.cc (irange::irange_union): Rename to... (irange::union_): ...this. (irange::irange_intersect): Rename to... (irange::intersect): ...this. * value-range.h (irange::union_): Delete. (irange::intersect): Delete. --- gcc/value-range.cc | 11 +++++++---- gcc/value-range.h | 14 -------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/gcc/value-range.cc b/gcc/value-range.cc index a0e49df28f3..69b214ecc06 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1246,11 +1246,13 @@ irange::irange_single_pair_union (const irange &r) return true; } -// union_ for multi-ranges. +// Return TRUE if anything changes. bool -irange::irange_union (const irange &r) +irange::union_ (const vrange &v) { + const irange &r = as_a (v); + if (r.undefined_p ()) return false; @@ -1415,11 +1417,12 @@ irange::irange_contains_p (const irange &r) const } -// Intersect for multi-ranges. Return TRUE if anything changes. +// Return TRUE if anything changes. bool -irange::irange_intersect (const irange &r) +irange::intersect (const vrange &v) { + const irange &r = as_a (v); gcc_checking_assert (undefined_p () || r.undefined_p () || range_compatible_p (type (), r.type ())); diff --git a/gcc/value-range.h b/gcc/value-range.h index 10c44c5c062..6d108154dc1 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -170,8 +170,6 @@ protected: irange (tree *, unsigned); // In-place operators. - bool irange_union (const irange &); - bool irange_intersect (const irange &); void irange_set (tree, tree); void irange_set_anti_range (tree, tree); bool irange_contains_p (const irange &) const; @@ -903,18 +901,6 @@ irange::upper_bound () const return upper_bound (pairs - 1); } -inline bool -irange::union_ (const vrange &r) -{ - return irange_union (as_a (r)); -} - -inline bool -irange::intersect (const vrange &r) -{ - return irange_intersect (as_a (r)); -} - // Set value range VR to a nonzero range of type TYPE. inline void -- 2.40.0