From patchwork Thu Aug 1 14:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 95054 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 AAD6C384AB5E for ; Thu, 1 Aug 2024 15:34:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by sourceware.org (Postfix) with ESMTPS id 41DE73860C34 for ; Thu, 1 Aug 2024 15:00:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 41DE73860C34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 41DE73860C34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::536 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524471; cv=none; b=TgJ6w0IZwMeFNAHkqGn9393qTPUNyvPTJnhCjgnc28emXoipr8rKfZm7GVhwsnvn3IOxYLRKcjeV5e6bJINfivcM/Aj4YZUHCcv5bFjYXbqirS2ZxR/gBR8h94X4PnWMRbaiqMX3UokUR/CXu4kw/ZYlhRRMfYNrf+MpKGvP2l8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524471; c=relaxed/simple; bh=kM+om+IfnmydqaTJA273usCv057sV1H/IwwvSYlSGYg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ceCPIscADScBCMqvTZPjtD2Pu5dOW9D1Tq6JBZHF9ZtlR2nzcZaLVzSrjPsXY1dOA1USyUCnP7R6HdQiSddu1A0vVhMdpopQIBNQPZTsaycUzcapiuv1HQ6UJ7ZkY7VbDKcdaSQ1SFWNAaOCCpOSaM7R8ZP0dFf3BcbsiYBdsqY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5a2ffc34431so5446822a12.0 for ; Thu, 01 Aug 2024 08:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524414; x=1723129214; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m31iuSNO6C/dz6KXMeTHtdzPi7/NzSONPpFcYdUEZEw=; b=LmS8rAY8IOByJVvEmtKdPWb+ObXzLE6lf104yQgpm6G6qu+vKbJ+UICVRDlQ3oBNlI KnlMw4yighn1pBhGb4jxsv/MPqyrDKS9jNDq8kT2MvTtjSvynaaV9XROUWp+GXGlEHUq UvwkmgLqTKUDrglv5THlOuTUY4UD2OfDhHQ+1oERkPSQtECFQ92Jz/JkKICpzAYgWWC5 MUb8D8g16A6xkuniEMUMrzX4KVKYqnDfRbVpdyP0/7vHoA/Rp9TZ8/2sPXabPGvIciHu 2AvgIXPYVZEv8Uy3jNKtbKGEyM4oRce5kMVkrYz3ioaJvvoARQcLrloAfPCjINjsYenr vA3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524414; x=1723129214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m31iuSNO6C/dz6KXMeTHtdzPi7/NzSONPpFcYdUEZEw=; b=tZA0shpDhDjREjPp4G4EfNUOpz6poEQEtS5W5J1USkTBT+zPsnqRI6cqdAA1WmcJEu WcWplH4BAPlpuWyNQTJC7ruiBJMzZ4n3I4zsPB7MBah62Rv1gBPmVv1VueDcMR18KT3k 87BOfS1Ngr2ykWiIajf1UC9C8UBC+mW5+LflPsBHEl+c7sujV86R3a578V9yM+hcGAJm FTSyZbSbDsOBATWQpM09z08mUkMRwdRxSxPxIZm07/yAkB6q20t2pyw2TG1FpNIZ7Ovj rj3hoNa59q00GBvLa5W6jHmVXPJ9FIC2zpkcwYOPx/Qsvye9O3ZlM/cOVlQbIEiPhoIx 6vRA== X-Gm-Message-State: AOJu0YwOBzldNGRs9ZpTUSJEgTQSZBsGyWTf3TKGnirbLkVOtybWwLpi jxswfQZanBIqQrF6xdbBzjG3nvBhSHQV0/t11Hb9ynZ7gi5btQVnBmGKEowZS7QbAyyV1gcS7Ym idDzU X-Google-Smtp-Source: AGHT+IHpZaliw7782+AL4/3pLNG+4hIJ4QRePvi8iS48h5zUh9nmWmAxvBdWi3aoz5iGnVWfmGc62g== X-Received: by 2002:a05:6402:f89:b0:5a0:d004:60c6 with SMTP id 4fb4d7f45d1cf-5b7f3eba1c3mr553049a12.18.1722524413591; Thu, 01 Aug 2024 08:00:13 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:9:dc84:3622:6733:ff49:ee91]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590592sm10252456a12.25.2024.08.01.08.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 08:00:13 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [PATCH 100/125] gccrs: nr2.0: Add new test cases. Date: Thu, 1 Aug 2024 16:57:36 +0200 Message-ID: <20240801145809.366388-102-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801145809.366388-2-arthur.cohen@embecosm.com> References: <20240801145809.366388-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 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 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~patchwork=sourceware.org@gcc.gnu.org gcc/testsuite/ChangeLog: * rust/compile/name_resolution13.rs: Add new module and remove compile step. * rust/compile/name_resolution14.rs: New test. * rust/compile/name_resolution15.rs: New test. * rust/compile/name_resolution16.rs: New test. * rust/compile/name_resolution17.rs: New test. * rust/compile/name_resolution18.rs: New test. * rust/compile/name_resolution19.rs: New test. * rust/compile/name_resolution20.rs: New test. * rust/compile/name_resolution21.rs: New test. --- .../rust/compile/name_resolution13.rs | 6 +++++- .../rust/compile/name_resolution14.rs | 15 ++++++++++++++ .../rust/compile/name_resolution15.rs | 20 +++++++++++++++++++ .../rust/compile/name_resolution16.rs | 18 +++++++++++++++++ .../rust/compile/name_resolution17.rs | 10 ++++++++++ .../rust/compile/name_resolution18.rs | 15 ++++++++++++++ .../rust/compile/name_resolution19.rs | 20 +++++++++++++++++++ .../rust/compile/name_resolution20.rs | 11 ++++++++++ .../rust/compile/name_resolution21.rs | 12 +++++++++++ 9 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/rust/compile/name_resolution14.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution15.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution16.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution17.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution18.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution19.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution20.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution21.rs diff --git a/gcc/testsuite/rust/compile/name_resolution13.rs b/gcc/testsuite/rust/compile/name_resolution13.rs index 52a152bf51a..33edbf9312e 100644 --- a/gcc/testsuite/rust/compile/name_resolution13.rs +++ b/gcc/testsuite/rust/compile/name_resolution13.rs @@ -1,4 +1,8 @@ -// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" } +// { dg-options "-frust-name-resolution-2.0" } + +pub mod foo { + pub macro bar() {} +} fn foo() { let b = 10; diff --git a/gcc/testsuite/rust/compile/name_resolution14.rs b/gcc/testsuite/rust/compile/name_resolution14.rs new file mode 100644 index 00000000000..eaef6a52f16 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution14.rs @@ -0,0 +1,15 @@ +// { dg-options "-frust-name-resolution-2.0" } + +pub mod foo { + pub macro bar() {} +} + +use foo::biz; // { dg-error "unresolved import .foo::biz. .E0433." } + +use foo::{bar, baz, biz}; +// { dg-error "unresolved import .foo::baz. .E0433." "" { target *-*-* } .-1 } +// { dg-error "unresolved import .foo::biz. .E0433." "" { target *-*-* } .-2 } + +fn main() { + bar!(); +} diff --git a/gcc/testsuite/rust/compile/name_resolution15.rs b/gcc/testsuite/rust/compile/name_resolution15.rs new file mode 100644 index 00000000000..45f38da768a --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution15.rs @@ -0,0 +1,20 @@ +// { dg-additional-options "-frust-name-resolution-2.0" } +#![feature(decl_macro)] + +pub mod foo { + pub struct Foo { + pub a: i32, + } + pub fn Foo() {} + pub macro Foo() {{}} +} + +pub use foo::Foo; + +use self::Foo as Fo; + +fn main() { + let _a = Fo(); + let _b = Fo { a: 15 }; + let _c = Fo!(); +} diff --git a/gcc/testsuite/rust/compile/name_resolution16.rs b/gcc/testsuite/rust/compile/name_resolution16.rs new file mode 100644 index 00000000000..230722ef819 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution16.rs @@ -0,0 +1,18 @@ +// { dg-additional-options "-frust-name-resolution-2.0" } +#![feature(decl_macro)] + +pub mod foo { + pub struct Foo { + pub a: i32, + } + pub fn Foo() {} + pub macro Foo() {{}} +} + +pub use foo::Foo; + +fn main() { + let _a = Foo(); + let _b = Foo { a: 15 }; + let _c = Foo!(); +} diff --git a/gcc/testsuite/rust/compile/name_resolution17.rs b/gcc/testsuite/rust/compile/name_resolution17.rs new file mode 100644 index 00000000000..485947647a9 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution17.rs @@ -0,0 +1,10 @@ +// { dg-options "-frust-name-resolution-2.0" } + +struct Foo; +fn Foo() {} // { dg-error ".Foo. defined multiple times" } + +struct Marker; +struct Bar { + a: Marker, +} +fn Bar() {} // ok, since `Bar` is not a value here diff --git a/gcc/testsuite/rust/compile/name_resolution18.rs b/gcc/testsuite/rust/compile/name_resolution18.rs new file mode 100644 index 00000000000..5940149d3bb --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution18.rs @@ -0,0 +1,15 @@ +// { dg-options "-frust-name-resolution-2.0" } + +struct Marker; + +struct Foo { + a: Marker, +} + +pub mod foo { + struct Foo { + b: Marker, + } +} + +use foo::Foo; // { dg-error ".Foo. defined multiple times" } diff --git a/gcc/testsuite/rust/compile/name_resolution19.rs b/gcc/testsuite/rust/compile/name_resolution19.rs new file mode 100644 index 00000000000..9a2c84375c7 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution19.rs @@ -0,0 +1,20 @@ +struct Marker; + +fn foo(a: Marker, b: Marker) -> Marker { + let a = b; + + a +} + +fn bar() { + let a = 15; + + fn inner() { + // inner functions cannot capture dynamic environment + let b = a; // { dg-error "cannot find value .a. in this scope" } + } +} + +fn main() { + let m = foo(Marker, Marker); +} diff --git a/gcc/testsuite/rust/compile/name_resolution20.rs b/gcc/testsuite/rust/compile/name_resolution20.rs new file mode 100644 index 00000000000..e6c2dd5ea8f --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution20.rs @@ -0,0 +1,11 @@ +// { dg-options "-frust-name-resolution-2.0" } + +pub mod foo { + pub macro bar() {} +} + +use foo::bar; + +fn main() { + bar!(); +} diff --git a/gcc/testsuite/rust/compile/name_resolution21.rs b/gcc/testsuite/rust/compile/name_resolution21.rs new file mode 100644 index 00000000000..3d0af2b37b7 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution21.rs @@ -0,0 +1,12 @@ +// { dg-additional-options "-frust-name-resolution-2.0" } + +pub mod foo { + pub macro bar() {} +} + +use foo::bar; +use foo::bar; // { dg-error ".bar. defined multiple times" } + +fn main() { + bar!(); +}