attempt to minimize future conflicts

Author: folkertdev

tests/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs

@@ -1,14 +1,9 @@
 //@ compile-flags: -C no-prepopulate-passes
 
 #![crate_type = "lib"]
-#![feature(repr_simd, core_intrinsics, intrinsics)]
-#![allow(non_camel_case_types)]
-
-// use std::intrinsics::simd::simd_fpow; FIXME this intrinsic is not defined
 
-extern "rust-intrinsic" {
-    fn simd_fpow<T>(x: T, b: T) -> T;
-}
+#![feature(repr_simd, intrinsics)]
+#![allow(non_camel_case_types)]
 
 #[repr(simd)]
 #[derive(Copy, Clone, PartialEq, Debug)]
@@ -26,6 +21,10 @@ pub struct f32x8(pub [f32; 8]);
 #[derive(Copy, Clone, PartialEq, Debug)]
 pub struct f32x16(pub [f32; 16]);
 
+extern "rust-intrinsic" {
+    fn simd_fpow<T>(x: T, b: T) -> T;
+}
+
 // CHECK-LABEL: @fpow_32x2
 #[no_mangle]
 pub unsafe fn fpow_32x2(a: f32x2, b: f32x2) -> f32x2 {

tests/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs

@@ -1,14 +1,9 @@
 //@ compile-flags: -C no-prepopulate-passes
 
 #![crate_type = "lib"]
-#![feature(repr_simd, core_intrinsics, intrinsics)]
-#![allow(non_camel_case_types)]
-
-// use std::intrinsics::simd::simd_fpowi; FIXME this intrinsic is not defined
 
-extern "rust-intrinsic" {
-    fn simd_fpowi<T>(x: T, b: i32) -> T;
-}
+#![feature(repr_simd, intrinsics)]
+#![allow(non_camel_case_types)]
 
 #[repr(simd)]
 #[derive(Copy, Clone, PartialEq, Debug)]
@@ -26,6 +21,10 @@ pub struct f32x8(pub [f32; 8]);
 #[derive(Copy, Clone, PartialEq, Debug)]
 pub struct f32x16(pub [f32; 16]);
 
+extern "rust-intrinsic" {
+    fn simd_fpowi<T>(x: T, b: i32) -> T;
+}
+
 // CHECK-LABEL: @fpowi_32x2
 #[no_mangle]
 pub unsafe fn fpowi_32x2(a: f32x2, b: i32) -> f32x2 {

tests/ui/simd/intrinsic/float-math-pass.rs

@@ -17,11 +17,9 @@ struct f32x4(pub [f32; 4]);
 
 use std::intrinsics::simd::*;
 
-// FIXME not currently exposed from std::intrinsics::simd
 #[rustc_intrinsic]
 unsafe fn simd_fpow<T>(x: T, y: T) -> T;
 
-// FIXME not currently exposed from std::intrinsics::simd
 #[rustc_intrinsic]
 unsafe fn simd_fpowi<T>(x: T, y: i32) -> T;