Make llvm_intrinsics a submodule of intrinsics

Author: bjorn3

src/abi/mod.rs

@@ -419,7 +419,7 @@ pub fn codegen_terminator_call<'tcx>(
             ty::Instance::resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs).unwrap();
 
         if fx.tcx.symbol_name(instance).name.as_str().starts_with("llvm.") {
-            crate::llvm_intrinsics::codegen_llvm_intrinsic_call(
+            crate::intrinsics::llvm::codegen_llvm_intrinsic_call(
                 fx,
                 &fx.tcx.symbol_name(instance).name.as_str(),
                 substs,

src/llvm_intrinsics.rs renamed to src/intrinsics/llvm.rs

@@ -1,3 +1,5 @@
+pub mod llvm;
+
 use crate::prelude::*;
 
 macro intrinsic_pat {
@@ -35,7 +37,7 @@ macro intrinsic_substs {
     }
 }
 
-pub macro intrinsic_match {
+macro intrinsic_match {
     ($fx:expr, $intrinsic:expr, $substs:expr, $args:expr,
     _ => $unknown:block;
     $(
@@ -128,7 +130,7 @@ macro_rules! atomic_minmax {
     };
 }
 
-pub fn lane_type_and_count<'tcx>(
+fn lane_type_and_count<'tcx>(
     fx: &FunctionCx<'_, 'tcx, impl Backend>,
     layout: TyLayout<'tcx>,
     intrinsic: &str,
@@ -145,7 +147,7 @@ pub fn lane_type_and_count<'tcx>(
     (lane_layout, lane_count)
 }
 
-pub fn simd_for_each_lane<'tcx, B: Backend>(
+fn simd_for_each_lane<'tcx, B: Backend>(
     fx: &mut FunctionCx<'_, 'tcx, B>,
     intrinsic: &str,
     x: CValue<'tcx>,
@@ -177,7 +179,7 @@ pub fn simd_for_each_lane<'tcx, B: Backend>(
     }
 }
 
-pub fn bool_to_zero_or_max_uint<'tcx>(
+fn bool_to_zero_or_max_uint<'tcx>(
     fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     layout: TyLayout<'tcx>,
     val: Value,

src/intrinsics.rs renamed to src/intrinsics/mod.rs

@@ -45,7 +45,6 @@ mod discriminant;
 mod driver;
 mod intrinsics;
 mod linkage;
-mod llvm_intrinsics;
 mod main_shim;
 mod metadata;
 mod num;