generic first attempt, erroring intrinsic.rs

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder.rs

@@ -1,4 +1,4 @@
-use std::borrow::Cow;
+use std::borrow::{Borrow, Cow};
 use std::ops::Deref;
 use std::{iter, ptr};
 
@@ -38,28 +38,37 @@ use crate::type_of::LayoutLlvmExt;
 use crate::value::Value;
 
 // All Builders must have an llfn associated with them
-#[must_use]
-pub(crate) struct SBuilder<'a, 'll> {
-    pub llbuilder: &'ll mut llvm::Builder<'ll>,
-    pub cx: &'a SimpleCx<'ll>,
-}
-
-impl Drop for SBuilder<'_, '_> {
-    fn drop(&mut self) {
-        unsafe {
-            llvm::LLVMDisposeBuilder(&mut *(self.llbuilder as *mut _));
-        }
-    }
-}
+//#[must_use]
+//pub(crate) struct SBuilder<'a, 'll> {
+//    pub llbuilder: &'ll mut llvm::Builder<'ll>,
+//    pub cx: &'a SimpleCx<'ll>,
+//}
+
+pub(crate) type SBuilder<'a, 'll> = GenericBuilder<'a, 'll, SimpleCx<'ll>>;
+
+//impl Drop for SBuilder<'_, '_> {
+//    fn drop(&mut self) {
+//        unsafe {
+//            llvm::LLVMDisposeBuilder(&mut *(self.llbuilder as *mut _));
+//        }
+//    }
+//}
 
 // All Builders must have an llfn associated with them
 #[must_use]
-pub(crate) struct Builder<'a, 'll, 'tcx> {
+//pub(crate) struct Builder<'a, 'll, 'tcx> {
+//    pub llbuilder: &'ll mut llvm::Builder<'ll>,
+//    pub cx: &'a CodegenCx<'ll, 'tcx>,
+//}
+//
+pub(crate) struct GenericBuilder<'a, 'll, CX: Borrow<SimpleCx<'ll>>> {
     pub llbuilder: &'ll mut llvm::Builder<'ll>,
-    pub cx: &'a CodegenCx<'ll, 'tcx>,
+    pub cx: &'a CX,
 }
 
-impl Drop for Builder<'_, '_, '_> {
+pub(crate) type Builder<'a, 'll, 'tcx> = GenericBuilder<'a, 'll, CodegenCx<'ll, 'tcx>>;
+
+impl<'a, 'll, CX: Borrow<SimpleCx<'ll>>> Drop for GenericBuilder<'a, 'll, CX> {
     fn drop(&mut self) {
         unsafe {
             llvm::LLVMDisposeBuilder(&mut *(self.llbuilder as *mut _));
@@ -269,7 +278,8 @@ macro_rules! set_math_builder_methods {
     }
 }
 
-impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
+//impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
+impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for GenericBuilder<'a, 'll, CodegenCx<'ll, 'tcx>> {
     type CodegenCx = CodegenCx<'ll, 'tcx>;
 
     fn build(cx: &'a CodegenCx<'ll, 'tcx>, llbb: &'ll BasicBlock) -> Self {

compiler/rustc_codegen_llvm/src/context.rs

@@ -57,6 +57,12 @@ impl<'ll, 'tcx> Deref for CodegenCx<'ll, 'tcx> {
     }
 }
 
+impl<'ll> Borrow<SimpleCx<'ll>> for CodegenCx<'ll, '_> {
+    fn borrow(&self) -> &SimpleCx<'ll> {
+        &self.scx
+    }
+}
+
 /// There is one `CodegenCx` per codegen unit. Each one has its own LLVM
 /// `llvm::Context` so that several codegen units may be processed in parallel.
 /// All other LLVM data structures in the `CodegenCx` are tied to that `llvm::Context`.