From patchwork Mon May 29 08:29:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 100170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1367023vqr; Mon, 29 May 2023 01:46:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ykA9HJQggxZ6M0Jz/1kRd4l4j5Mi8J6GSl5sgXEQcv1Czu2Wc77YqOavU9Y/4rf6Dyb6h X-Received: by 2002:a17:906:5d05:b0:965:d17b:292 with SMTP id g5-20020a1709065d0500b00965d17b0292mr9823454ejt.60.1685350013601; Mon, 29 May 2023 01:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685350013; cv=none; d=google.com; s=arc-20160816; b=W/hGE0QP3EXYaPIizA+1wULEaQctNw+jC6CIk779Md8Z9vpLlyhsjx9Ipnml6mPSVM IPBy3GvS7mADOPyyD2AhdimxnwyM3CBAMUZ4JS1syE9VnenaNsPGCOAvG0LDawCkDmIi CadWtyi7ZL7q10SBvGMobqQWZjWZFRmgSdFWMc8ygM4m2XmLIbegY+wF2ZWkM8h4HSgE fFkBLBpMA8snzwMAhUly/pZPIuPZ/r3RFOXvMML+H3DknrrbqPFwWSg/6a5h4l7PqVFG UhYV2HZ87CmUAZy+/IN4NKsAsPZt5elCzW5YfRIj6IWm8ysZZuaFpjAb6ik+ivsDzaw0 iXig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=b0strRjmERB5N3TXCBWBiBpDaOKrw/mxigMQSIsgNb0=; b=WB/829RJVwlIzFtfFZmCPoVWpEeajr1kr46LBzCkUby73VrdlWQq93fldlsVbmQ/3R +0sCde+kfMN870M5Ptb06rUf6/tnxx09GVEg9VMPhS5xE9gqF5qw0Tp36ouryqeoXDmP wQLui3cfIHyZCMSYbpv143IZFjSfTOGYFaKn/RaOkPE5Wt0yJI47Nxgqzelvl732rfDH ry0ULiTV4norrmnY9gB4FdPnwafCT21jf4ICQmIa9XOvPHTV91IE0ZeTb2kFyjvqRHXz PrRSpP2c6SdwPxlsjX+OiFCmDFx3sE+NKRNuWtEwk549Lx44HwgXPohRv3uB+QCaF9po IDtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FJEnPudH; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gz11-20020a170906f2cb00b0094ed1a56fbdsi4169545ejb.902.2023.05.29.01.46.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:46:53 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FJEnPudH; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 369F93889E08 for ; Mon, 29 May 2023 08:38:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 369F93889E08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685349537; bh=b0strRjmERB5N3TXCBWBiBpDaOKrw/mxigMQSIsgNb0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=FJEnPudHPU7xfpkfOdYCo7PSmO8yvU9XPmJXDDjrQ7koCkKn4xX3RbQ3fpJeg3pAx A6Zpsf7ArVSCC/FilunOtJxVpDerS4O8JxOonGvKmAF0qtxAWTx9tCjpPPwjm28lQx dZ0+ciG+RHJ+Ku4Kjc+qAxDH/j7qGsriIf0dHc/s= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 90D2538498C6 for ; Mon, 29 May 2023 08:29:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90D2538498C6 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f6042d605dso19350205e9.2 for ; Mon, 29 May 2023 01:29:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685348974; x=1687940974; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=b0strRjmERB5N3TXCBWBiBpDaOKrw/mxigMQSIsgNb0=; b=f1IXt8ImK+FBdzlDzKpatdaO5nn/JCeaA9eTJmrzDUdYaZW2fwt+lt14pWWbnASOol f+Y6NYE14jaGxyb4ZYmqvR8P7tKT9yCM43ZbBPrsG1sGL+aYqLX2CvQ87wws8z1TuaqE 1hnDw2PuvXoYehg+vT3wy5kO8bSYWgkmlefFRg/7Y4mtMAolvfG5gRwCtjDD0umLq7pd PtIRsNtI1Y0zEw18EAweWmvI444tJ7hTH84f+W7oT8au7sL2JYT4bTU3PjoGPJIxBme2 7bTF25YbAlPXqDHH3rJV65eM4Mgj3JrcHtxlAEFwbfED4hQIRp1RCV3pLxPkc3kz/JTr B+Kw== X-Gm-Message-State: AC+VfDyrB1jJG3QcjfWvXPJjLzFKpNKwn8aWHNA3PWNle+XSmR9S8k1l 3ktwGqe1s5mcH6DiBIuRg7dhxGUCIMFUGae7vGgxlQ== X-Received: by 2002:a1c:7c1a:0:b0:3f6:c8c:7048 with SMTP id x26-20020a1c7c1a000000b003f60c8c7048mr8400649wmc.20.1685348974410; Mon, 29 May 2023 01:29:34 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003f4248dcfcbsm17102527wmc.30.2023.05.29.01.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:29:33 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Fix remaining failures in Roman Numbers test Date: Mon, 29 May 2023 10:29:33 +0200 Message-Id: <20230529082933.2410460-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 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: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767217575947866133?= X-GMAIL-MSGID: =?utf-8?q?1767217575947866133?= From: Eric Botcazou The test is inspired from the example of user-defined literals given in the Ada 2022 RM. Mixed Arabic numbers/Roman numbers computations are rejected because the second resolution pass would try to resolve Arabic numbers only as user-defined literals. gcc/ada/ * sem_res.adb (Try_User_Defined_Literal): For arithmetic operators, also accept operands whose type is covered by the resolution type. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_res.adb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 066072a6afe..17b74ea65d5 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -13333,12 +13333,16 @@ package body Sem_Res is -- Both operands must have the same type as the context -- (ignoring for now fixed-point and exponentiation ops). - if Has_Applicable_User_Defined_Literal (Right_Opnd (N), Typ) then + if Covers (Typ, Etype (Right_Opnd (N))) + or else Has_Applicable_User_Defined_Literal (Right_Opnd (N), Typ) + then Resolve (Left_Opnd (N), Typ); Analyze_And_Resolve (N, Typ); return True; - elsif Has_Applicable_User_Defined_Literal (Left_Opnd (N), Typ) then + elsif Covers (Typ, Etype (Left_Opnd (N))) + or else Has_Applicable_User_Defined_Literal (Left_Opnd (N), Typ) + then Resolve (Right_Opnd (N), Typ); Analyze_And_Resolve (N, Typ); return True;