Skip to content

Commit c341614

Browse files
antoyoantoyo
committed
Fix tests
1 parent 765274b commit c341614

16 files changed

+95
-37
lines changed

‎patches/libgccjit12/0001-core-Disable-portable-simd-test.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a5663265f797a43c502915c356fe7899c16cee92 Mon Sep 17 00:00:00 2001
1+
From 124a11ce086952a5794d5cfbaa45175809497b81 Mon Sep 17 00:00:00 2001
22
From: None <[email protected]>
33
Date: Sat, 18 Nov 2023 10:50:36 -0500
44
Subject: [PATCH] [core] Disable portable-simd test
@@ -8,25 +8,25 @@ Subject: [PATCH] [core] Disable portable-simd test
88
1 file changed, 2 deletions(-)
99

1010
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
11-
index d0a119c..76fdece 100644
11+
index b71786c..cf484d5 100644
1212
--- a/library/core/tests/lib.rs
1313
+++ b/library/core/tests/lib.rs
14-
@@ -89,7 +89,6 @@
14+
@@ -95,7 +95,6 @@
1515
#![feature(never_type)]
1616
#![feature(unwrap_infallible)]
1717
#![feature(pointer_is_aligned_to)]
1818
-#![feature(portable_simd)]
1919
#![feature(ptr_metadata)]
20-
#![feature(lazy_cell)]
2120
#![feature(unsized_tuple_coercion)]
22-
@@ -155,7 +154,6 @@ mod pin;
21+
#![feature(const_option)]
22+
@@ -157,7 +156,6 @@ mod pin;
2323
mod pin_macro;
2424
mod ptr;
2525
mod result;
2626
-mod simd;
2727
mod slice;
2828
mod str;
2929
mod str_lossy;
30-
--
31-
2.42.1
30+
--
31+
2.45.2
3232

‎src/asm.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,8 @@ impl<'a, 'gcc, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tcx> {
537537
}
538538
if dest.is_none() && options.contains(InlineAsmOptions::NORETURN) {
539539
let builtin_unreachable = self.context.get_builtin_function("__builtin_unreachable");
540-
let builtin_unreachable: RValue<'gcc> = unsafe {
541-
std::mem::transmute(builtin_unreachable)
542-
};
540+
let builtin_unreachable: RValue<'gcc> =
541+
unsafe { std::mem::transmute(builtin_unreachable) };
543542
self.call(self.type_void(), None, None, builtin_unreachable, &[], None, None);
544543
}
545544

‎src/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
10041004
}
10051005
}
10061006

1007-
let val = if let Some(_) = place.val.llextra {
1007+
let val = if place.val.llextra.is_some() {
10081008
// FIXME: Merge with the `else` below?
10091009
OperandValue::Ref(place.val)
10101010
} else if place.layout.is_gcc_immediate() {
@@ -1672,7 +1672,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
16721672
_instance: Option<Instance<'tcx>>,
16731673
) -> RValue<'gcc> {
16741674
// FIXME(antoyo): remove when having a proper API.
1675-
let gcc_func = unsafe { std::mem::transmute(func) };
1675+
let gcc_func = unsafe { std::mem::transmute::<RValue<'gcc>, Function<'gcc>>(func) };
16761676
let call = if self.functions.borrow().values().any(|value| *value == gcc_func) {
16771677
self.function_call(func, args, funclet)
16781678
} else {

‎src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ impl<'gcc, 'tcx> MiscMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
501501
"rust_eh_personality"
502502
};
503503
let func = self.declare_func(name, self.type_i32(), &[], true);
504-
unsafe { std::mem::transmute(func) }
504+
unsafe { std::mem::transmute::<Function<'gcc>, RValue<'gcc>>(func) }
505505
}
506506
};
507507
// TODO(antoyo): apply target cpu attributes.

‎src/int.rs

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,16 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
8383
} else {
8484
let a_size = a_type.get_size();
8585
let b_size = b_type.get_size();
86-
if a_size > b_size {
87-
let b = self.context.new_cast(self.location, b, a_type);
88-
a >> b
89-
} else if a_size < b_size {
90-
let a = self.context.new_cast(self.location, a, b_type);
91-
a >> b
92-
} else {
93-
a >> b
86+
match a_size.cmp(&b_size) {
87+
std::cmp::Ordering::Less => {
88+
let a = self.context.new_cast(self.location, a, b_type);
89+
a >> b
90+
}
91+
std::cmp::Ordering::Equal => a >> b,
92+
std::cmp::Ordering::Greater => {
93+
let b = self.context.new_cast(self.location, b, a_type);
94+
a >> b
95+
}
9496
}
9597
}
9698
} else if a_type.is_vector() && a_type.is_vector() {
@@ -648,14 +650,16 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
648650
} else {
649651
let a_size = a_type.get_size();
650652
let b_size = b_type.get_size();
651-
if a_size > b_size {
652-
let b = self.context.new_cast(self.location, b, a_type);
653-
a << b
654-
} else if a_size < b_size {
655-
let a = self.context.new_cast(self.location, a, b_type);
656-
a << b
657-
} else {
658-
a << b
653+
match a_size.cmp(&b_size) {
654+
std::cmp::Ordering::Less => {
655+
let a = self.context.new_cast(self.location, a, b_type);
656+
a << b
657+
}
658+
std::cmp::Ordering::Equal => a << b,
659+
std::cmp::Ordering::Greater => {
660+
let b = self.context.new_cast(self.location, b, a_type);
661+
a << b
662+
}
659663
}
660664
}
661665
} else if a_type.is_vector() && a_type.is_vector() {

‎src/intrinsic/mod.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallMethods<'tcx> for Builder<'a, 'gcc, 'tcx> {
130130
let llval = match name {
131131
_ if simple.is_some() => {
132132
// FIXME(antoyo): remove this cast when the API supports function.
133-
let func = unsafe { std::mem::transmute(simple.expect("simple")) };
133+
let func = unsafe {
134+
std::mem::transmute::<Function<'gcc>, RValue<'gcc>>(simple.expect("simple"))
135+
};
134136
self.call(
135137
self.type_void(),
136138
None,
@@ -675,7 +677,11 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
675677
let step3 = self.or(left, right);
676678

677679
// Fourth step.
678-
if width == 8 { step3 } else { self.gcc_bswap(step3, width) }
680+
if width == 8 {
681+
step3
682+
} else {
683+
self.gcc_bswap(step3, width)
684+
}
679685
}
680686
128 => {
681687
// TODO(antoyo): find a more efficient implementation?
@@ -1194,7 +1200,7 @@ fn codegen_gnu_try<'gcc>(
11941200
bx.invoke(try_func_ty, None, None, try_func, &[data], then, catch, None, None);
11951201
});
11961202

1197-
let func = unsafe { std::mem::transmute(func) };
1203+
let func = unsafe { std::mem::transmute::<Function<'gcc>, RValue<'gcc>>(func) };
11981204

11991205
// Note that no invoke is used here because by definition this function
12001206
// can't panic (that's what it's catching).
@@ -1268,7 +1274,7 @@ fn gen_fn<'a, 'gcc, 'tcx>(
12681274
// FIXME(eddyb) find a nicer way to do this.
12691275
cx.linkage.set(FunctionType::Internal);
12701276
let func = cx.declare_fn(name, fn_abi);
1271-
let func_val = unsafe { std::mem::transmute(func) };
1277+
let func_val = unsafe { std::mem::transmute::<Function<'gcc>, RValue<'gcc>>(func) };
12721278
cx.set_frame_pointer_type(func_val);
12731279
cx.apply_target_cpu_attr(func_val);
12741280
let block = Builder::append_block(cx, func_val, "entry-block");

‎src/intrinsic/simd.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use rustc_codegen_ssa::errors::InvalidMonomorphization;
1313
use rustc_codegen_ssa::mir::operand::OperandRef;
1414
use rustc_codegen_ssa::mir::place::PlaceRef;
1515
use rustc_codegen_ssa::traits::{BaseTypeMethods, BuilderMethods};
16+
#[cfg(feature = "master")]
1617
use rustc_hir as hir;
1718
use rustc_middle::mir::BinOp;
1819
use rustc_middle::span_bug;

‎src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,10 @@ impl WriteBackendMethods for GccCodegenBackend {
413413
back::write::codegen(cgcx, dcx, module, config)
414414
}
415415

416-
fn prepare_thin(_module: ModuleCodegen<Self::Module>, _emit_summary: bool) -> (String, Self::ThinBuffer) {
416+
fn prepare_thin(
417+
_module: ModuleCodegen<Self::Module>,
418+
_emit_summary: bool,
419+
) -> (String, Self::ThinBuffer) {
417420
unimplemented!();
418421
}
419422

‎src/mono_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ impl<'gcc, 'tcx> PreDefineMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
8181
// TODO(antoyo): use inline attribute from there in linkage.set() above.
8282

8383
self.functions.borrow_mut().insert(symbol_name.to_string(), decl);
84-
self.function_instances.borrow_mut().insert(instance, unsafe { std::mem::transmute(decl) });
84+
self.function_instances.borrow_mut().insert(instance, decl);
8585
}
8686
}

‎tests/failing-run-make-tests.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ tests/run-make/doctests-runtool/
77
tests/run-make/emit-shared-files/
88
tests/run-make/exit-code/
99
tests/run-make/issue-22131/
10-
tests/run-make/issue-38237/
1110
tests/run-make/issue-64153/
1211
tests/run-make/llvm-ident/
1312
tests/run-make/native-link-modifier-bundle/

0 commit comments

Comments
 (0)