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.133.124]) by sourceware.org (Postfix) with ESMTPS id 94A9A385C421 for ; Tue, 12 Sep 2023 17:27:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94A9A385C421 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=1694539671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s5F+LZ/268ZWhnjNMDteg9QPVDMQUv1gCUOkW+NTnhQ=; b=Ja5YvlaAap7GVdnyL9hMnVXre1JzJatbJJFf8uohKsKDqy1ATam1gGN07zZOdr0KaOkldN 6Sbi+o8t8SqkOjSoj+cMhr/GMLVK0wnBdpdZNJRy1h7XdTZVXVbzP1+LJmEArcyngYyx42 F0fBZgB2/JnSiSI7OK/sF+0RZzn2+SU= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-354-F549Fty1MEerocW15ze4vQ-1; Tue, 12 Sep 2023 13:27:49 -0400 X-MC-Unique: F549Fty1MEerocW15ze4vQ-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-414bbfbdf37so67980031cf.1 for ; Tue, 12 Sep 2023 10:27:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694539668; x=1695144468; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s5F+LZ/268ZWhnjNMDteg9QPVDMQUv1gCUOkW+NTnhQ=; b=rudPqSpDMMar8ahoxiK78jE+2YjBquTyOXLIKhemK6uBUHZNAQp1YoeHfhhJPUII8w bCz229OdzvUky6KDSVi4OIoDucT4Nog3/K+QMBOnMRBezt5XtKDqnun3YxIABfoAP4Lt N9v4mCgX52GziD4UDu0rAMZJ/QrZMxo2dGPm9sVXd3Ay7IVPwt86cL9UYJDQH/6LUupg cKfr3e4hdNlnVj0oD9jgjIpPUQwPmq3RKHeswTB7DyRjlYdzKbRKgxfZ4WqG+6j1qMH3 4AjyX+6nhfw6xQ5f/GMozO/2TvHEiU4KxU0zN8AFI7EVJ/U5AhXw1L/L4Nmq1ZPDDfcR XGgQ== X-Gm-Message-State: AOJu0YzjK2+13lBIu0HFcpWZur3tkIjA2kA95bH6nurMg1ExYh3V7ROM kYWeMjJWErQS2i9TPXJuVSePQAfRRzLSD6tKiQKXx9KE6G+Es2dGTWTfLQQYVT/RqOOAaZCDPQB q+q+hqFPG8TP5s+mxZODstqB/qZfhi1QwVRz+YS73MJ/qr/rpO7H90KNiz+Cvz/dQLcvYHYNsFg == X-Received: by 2002:a05:622a:188d:b0:400:ab3a:1714 with SMTP id v13-20020a05622a188d00b00400ab3a1714mr16804982qtc.11.1694539668502; Tue, 12 Sep 2023 10:27:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrwatp9fn2xXPykH9tbha4wyFXENGQJPx/aHPrU1QncfN1gnPf5++NohYTgU04fQpuNHXTdQ== X-Received: by 2002:a05:622a:188d:b0:400:ab3a:1714 with SMTP id v13-20020a05622a188d00b00400ab3a1714mr16804963qtc.11.1694539668127; Tue, 12 Sep 2023 10:27:48 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id q29-20020a05620a039d00b0076effd9809fsm3326678qkm.110.2023.09.12.10.27.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 10:27:47 -0700 (PDT) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: __integer_pack with class argument [PR111357] Date: Tue, 12 Sep 2023 13:27:44 -0400 Message-Id: <20230912172744.1930180-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 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=-12.6 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_H3,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 List-Id: Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- The argument might not already be an integer. PR c++/111357 gcc/cp/ChangeLog: * pt.cc (expand_integer_pack): Convert argument to int. gcc/testsuite/ChangeLog: * g++.dg/ext/integer-pack7.C: New test. --- gcc/cp/pt.cc | 2 ++ gcc/testsuite/g++.dg/ext/integer-pack7.C | 38 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/integer-pack7.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 838179d5fe3..b583c11eb99 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -3793,6 +3793,8 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain, } else { + hi = perform_implicit_conversion_flags (integer_type_node, hi, complain, + LOOKUP_IMPLICIT); hi = instantiate_non_dependent_expr (hi, complain); hi = cxx_constant_value (hi, complain); int len = valid_constant_size_p (hi) ? tree_to_shwi (hi) : -1; diff --git a/gcc/testsuite/g++.dg/ext/integer-pack7.C b/gcc/testsuite/g++.dg/ext/integer-pack7.C new file mode 100644 index 00000000000..95b1195bef4 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/integer-pack7.C @@ -0,0 +1,38 @@ +// PR c++/111357 +// { dg-do compile { target c++11 } } + +namespace std { + template + struct integer_sequence + { }; + + template + using make_integer_sequence + = integer_sequence<_Tp, __integer_pack(_Num)...>; +} + +using std::integer_sequence; +using std::make_integer_sequence; + +template +void g(integer_sequence) +{} + +template +struct c1 +{ + static constexpr int value = 1; + constexpr operator int() { return value; } +}; +template +struct R +{ + using S = make_integer_sequence{}>; + + R() noexcept(noexcept(g(S()))) + {} +}; +int main() +{ + R(); +} base-commit: ea5abbb263315e558c876b50c9371b90ddd5e028 -- 2.39.3