From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 0B6B33858435; Sat, 6 Aug 2022 12:10:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B6B33858435 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Merge #1430 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: c788a806195f326a595cd15b96c59e7584927f1a X-Git-Newrev: bc65cac0e79c9799fa62635df295e73b14501660 Message-Id: <20220806121016.0B6B33858435@sourceware.org> Date: Sat, 6 Aug 2022 12:10:16 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2022 12:10:16 -0000 https://gcc.gnu.org/g:bc65cac0e79c9799fa62635df295e73b14501660 commit bc65cac0e79c9799fa62635df295e73b14501660 Merge: c788a806195 8141f618bb5 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Aug 4 19:47:43 2022 +0000 Merge #1430 1430: hir: more conformant builtin macro detection r=philberty a=liushuyu - hir: more conformant builtin macro detection Fixes #971 Co-authored-by: liushuyu Diff: gcc/rust/util/rust-hir-map.cc | 20 +++++++++++++++++--- .../rust/compile/builtin_macro_compile_error.rs | 1 + gcc/testsuite/rust/compile/builtin_macro_concat.rs | 1 + gcc/testsuite/rust/compile/builtin_macro_env.rs | 1 + .../rust/compile/builtin_macro_include_bytes.rs | 1 + .../rust/compile/builtin_macro_include_str.rs | 1 + gcc/testsuite/rust/compile/macro42.rs | 1 + .../rust/execute/torture/builtin_macro_cfg.rs | 1 + .../rust/execute/torture/builtin_macro_concat.rs | 1 + .../rust/execute/torture/builtin_macro_env.rs | 2 +- .../execute/torture/builtin_macro_include_bytes.rs | 2 +- .../execute/torture/builtin_macro_include_str.rs | 2 +- .../rust/execute/torture/builtin_macro_line.rs | 3 ++- .../rust/execute/torture/builtin_macros1.rs | 1 + .../rust/execute/torture/builtin_macros3.rs | 1 + gcc/testsuite/rust/execute/torture/macros29.rs | 1 + gcc/testsuite/rust/execute/torture/macros30.rs | 1 + gcc/testsuite/rust/execute/torture/macros31.rs | 1 + 18 files changed, 35 insertions(+), 7 deletions(-)