From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/codegen/remap_path_prefix/aux_mod.rs | 6 ----- .../auxiliary/remap_path_prefix_aux.rs | 8 ------- .../remap_path_prefix/auxiliary/xcrate-generic.rs | 6 ----- .../remap_path_prefix/issue-73167-remap-std.rs | 15 ------------ src/test/codegen/remap_path_prefix/main.rs | 28 ---------------------- .../codegen/remap_path_prefix/xcrate-generic.rs | 14 ----------- 6 files changed, 77 deletions(-) delete mode 100644 src/test/codegen/remap_path_prefix/aux_mod.rs delete mode 100644 src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs delete mode 100644 src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs delete mode 100644 src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs delete mode 100644 src/test/codegen/remap_path_prefix/main.rs delete mode 100644 src/test/codegen/remap_path_prefix/xcrate-generic.rs (limited to 'src/test/codegen/remap_path_prefix') diff --git a/src/test/codegen/remap_path_prefix/aux_mod.rs b/src/test/codegen/remap_path_prefix/aux_mod.rs deleted file mode 100644 index 44cc4bb72..000000000 --- a/src/test/codegen/remap_path_prefix/aux_mod.rs +++ /dev/null @@ -1,6 +0,0 @@ -// ignore-test: this is not a test - -#[inline] -pub fn some_aux_mod_function() -> i32 { - 1234 -} diff --git a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs b/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs deleted file mode 100644 index 887915955..000000000 --- a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs +++ /dev/null @@ -1,8 +0,0 @@ -// - -// compile-flags: -g --remap-path-prefix={{cwd}}=/the/aux-cwd --remap-path-prefix={{src-base}}/remap_path_prefix/auxiliary=/the/aux-src - -#[inline] -pub fn some_aux_function() -> i32 { - 1234 -} diff --git a/src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs b/src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs deleted file mode 100644 index 59092dbf6..000000000 --- a/src/test/codegen/remap_path_prefix/auxiliary/xcrate-generic.rs +++ /dev/null @@ -1,6 +0,0 @@ -// -// compile-flags: -g --remap-path-prefix={{cwd}}=/the/aux-cwd --remap-path-prefix={{src-base}}/remap_path_prefix/auxiliary=/the/aux-src - -#![crate_type = "lib"] - -pub fn foo() {} diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs deleted file mode 100644 index b66abc6be..000000000 --- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs +++ /dev/null @@ -1,15 +0,0 @@ -// ignore-windows - -// compile-flags: -g -C no-prepopulate-passes -Z simulate-remapped-rust-src-base=/rustc/xyz - -// Here we check that importing std will not cause real path to std source files -// to leak. If rustc was compiled with remap-debuginfo = true, this should be -// true automatically. If paths to std library hasn't been remapped, we use the -// above simulate-remapped-rust-src-base option to do it temporarily - -// CHECK: !DIFile(filename: "{{/rustc/.*/library/std/src/panic.rs}}" -fn main() { - std::thread::spawn(|| { - println!("hello"); - }); -} diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs deleted file mode 100644 index 9bef743dd..000000000 --- a/src/test/codegen/remap_path_prefix/main.rs +++ /dev/null @@ -1,28 +0,0 @@ -// ignore-windows -// - -// compile-flags: -g -C no-prepopulate-passes --remap-path-prefix={{cwd}}=/the/cwd --remap-path-prefix={{src-base}}=/the/src -Zinline-mir=no -// aux-build:remap_path_prefix_aux.rs - -extern crate remap_path_prefix_aux; - -// Here we check that submodules and include files are found using the path without -// remapping. This test requires that rustc is called with an absolute path. -mod aux_mod; -include!("aux_mod.rs"); - -// Here we check that the expansion of the file!() macro is mapped. -// CHECK: @alloc2 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>, align 1 -pub static FILE_PATH: &'static str = file!(); - -fn main() { - remap_path_prefix_aux::some_aux_function(); - aux_mod::some_aux_mod_function(); - some_aux_mod_function(); -} - -// Here we check that local debuginfo is mapped correctly. -// CHECK: !DIFile(filename: "/the/src/remap_path_prefix/main.rs", directory: "" - -// And here that debuginfo from other crates are expanded to absolute paths. -// CHECK: !DIFile(filename: "/the/aux-src/remap_path_prefix_aux.rs", directory: "" diff --git a/src/test/codegen/remap_path_prefix/xcrate-generic.rs b/src/test/codegen/remap_path_prefix/xcrate-generic.rs deleted file mode 100644 index 7a9d2ca9b..000000000 --- a/src/test/codegen/remap_path_prefix/xcrate-generic.rs +++ /dev/null @@ -1,14 +0,0 @@ -// ignore-windows -// compile-flags: -g -C metadata=foo -C no-prepopulate-passes -// aux-build:xcrate-generic.rs - -#![crate_type = "lib"] - -extern crate xcrate_generic; - -pub fn foo() { - xcrate_generic::foo::(); -} - -// Here we check that local debuginfo is mapped correctly. -// CHECK: !DIFile(filename: "/the/aux-src/xcrate-generic.rs", directory: "" -- cgit v1.2.3