user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #151646 - matthiaskrgr:rollup-HPnXGA3, r=matthiaskrgr

Browse source 
Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#151404 (LoongArch: Fix direct-access-external-data test)
 - rust-lang/rust#151405 (LoongArch: Fix call-llvm-intrinsics test)
This commit is contained in:
bors 2026-01-25 16:31:05 +00:00
commit 38c71295e8
3 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/codegen-llvm/direct-access-external-data.rs
View file

@ -1,3 +1,4 @@
//@ ignore-loongarch64 (handles dso_local differently)
//@ ignore-powerpc64 (handles dso_local differently)
//@ ignore-apple (handles dso_local differently)

4
tests/codegen-llvm/loongarch-abi/call-llvm-intrinsics.rs
View file

@ -23,9 +23,7 @@ pub fn do_call() {
unsafe {
// Ensure that we `call` LLVM intrinsics instead of trying to `invoke` them
// CHECK: store float 4.000000e+00, ptr %{{.}}, align 4
// CHECK: load float, ptr %{{.}}, align 4
// CHECK: call float @llvm.sqrt.f32(float %{{.}}
// CHECK: call float @llvm.sqrt.f32(float 4.000000e+00)
sqrt(4.0);
}
}

47
tests/codegen-llvm/loongarch/direct-access-external-data.rs Normal file
View file

@ -0,0 +1,47 @@
//@ only-loongarch64
//@ revisions: DEFAULT PIE DIRECT INDIRECT
//@ [DEFAULT] compile-flags: -C relocation-model=static
//@ [PIE] compile-flags: -C relocation-model=pie
//@ [DIRECT] compile-flags: -C relocation-model=pie -Z direct-access-external-data=yes
//@ [INDIRECT] compile-flags: -C relocation-model=static -Z direct-access-external-data=no
#![crate_type = "rlib"]
#![feature(linkage)]
unsafe extern "C" {
// CHECK: @VAR = external
// DEFAULT-NOT: dso_local
// PIE-NOT: dso_local
// DIRECT-SAME: dso_local
// INDIRECT-NOT: dso_local
// CHECK-SAME: global i32
safe static VAR: i32;
// When "linkage" is used, we generate an indirection global.
// Check dso_local is still applied to the actual global.
// CHECK: @EXTERNAL = external
// DEFAULT-NOT: dso_local
// PIE-NOT: dso_local
// DIRECT-SAME: dso_local
// INDIRECT-NOT: dso_local
// CHECK-SAME: global i8
#[linkage = "external"]
safe static EXTERNAL: *const u32;
// CHECK: @WEAK = extern_weak
// DEFAULT-NOT: dso_local
// PIE-NOT: dso_local
// DIRECT-SAME: dso_local
// INDIRECT-NOT: dso_local
// CHECK-SAME: global i8
#[linkage = "extern_weak"]
safe static WEAK: *const u32;
}
#[no_mangle]
pub fn refer() {
core::hint::black_box(VAR);
core::hint::black_box(EXTERNAL);
core::hint::black_box(WEAK);
}