[WIP] Disable debuginfo generation

Author: bjorn3

src/base.rs

@@ -32,7 +32,7 @@ pub(crate) struct CodegenedFunction {
 pub(crate) fn codegen_fn<'tcx>(
     tcx: TyCtxt<'tcx>,
     cx: &mut crate::CodegenCx,
-    type_dbg: &mut TypeDebugContext<'tcx>,
+    //type_dbg: &mut TypeDebugContext<'tcx>,
     cached_func: Function,
     module: &mut dyn Module,
     instance: Instance<'tcx>,
@@ -63,9 +63,9 @@ pub(crate) fn codegen_fn<'tcx>(
     func.clear();
     func.name = UserFuncName::user(0, func_id.as_u32());
     func.signature = sig;
-    if cx.debug_context.is_some() {
-        func.collect_debug_info();
-    }
+    //if cx.debug_context.is_some() {
+    //    func.collect_debug_info();
+    //}
 
     let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
 
@@ -81,11 +81,11 @@ pub(crate) fn codegen_fn<'tcx>(
     let pointer_type = target_config.pointer_type();
     let clif_comments = crate::pretty_clif::CommentWriter::new(tcx, instance, fn_abi);
 
-    let func_debug_cx = if let Some(debug_context) = &mut cx.debug_context {
-        Some(debug_context.define_function(tcx, type_dbg, instance, fn_abi, &symbol_name, mir.span))
+    let func_debug_cx = None; /* if let Some(debug_context) = &mut cx.debug_context {
+    Some(debug_context.define_function(tcx, type_dbg, instance, fn_abi, &symbol_name, mir.span))
     } else {
-        None
-    };
+    None
+    };*/
 
     let exception_slot = bcx.declare_var(pointer_type);
 
@@ -243,6 +243,7 @@ pub(crate) fn compile_fn(
         }
     }
 
+    /*
     // Define debuginfo for function
     let debug_context = &mut cx.debug_context;
     profiler.generic_activity("generate debug info").run(|| {
@@ -254,6 +255,7 @@ pub(crate) fn compile_fn(
             );
         }
     });
+    */
 }
 
 fn verify_func(tcx: TyCtxt<'_>, writer: &crate::pretty_clif::CommentWriter, func: &Function) {

src/common.rs

@@ -404,14 +404,14 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
     }
 
     pub(crate) fn set_debug_loc(&mut self, source_info: mir::SourceInfo) {
-        if let Some(debug_context) = &mut self.cx.debug_context {
+        /*if let Some(debug_context) = &mut self.cx.debug_context {
             let (file_id, line, column) =
                 debug_context.get_span_loc(self.tcx, self.mir.span, source_info.span);
 
             let source_loc =
                 self.func_debug_cx.as_mut().unwrap().add_dbg_loc(file_id, line, column);
             self.bcx.set_srcloc(source_loc);
-        }
+        }*/
     }
 
     pub(crate) fn get_caller_location(&mut self, source_info: mir::SourceInfo) -> CValue<'tcx> {

src/driver/aot.rs

@@ -552,7 +552,7 @@ fn codegen_cgu_content(
                 let codegened_function = crate::base::codegen_fn(
                     tcx,
                     &mut cx,
-                    &mut type_dbg,
+                    //&mut type_dbg,
                     Function::new(),
                     module,
                     instance,
@@ -561,9 +561,9 @@ fn codegen_cgu_content(
             }
             MonoItem::Static(def_id) => {
                 let data_id = crate::constant::codegen_static(tcx, module, def_id);
-                if let Some(debug_context) = &mut cx.debug_context {
-                    debug_context.define_static(tcx, &mut type_dbg, def_id, data_id);
-                }
+                // if let Some(debug_context) = &mut cx.debug_context {
+                //     debug_context.define_static(tcx, &mut type_dbg, def_id, data_id);
+                // }
             }
             MonoItem::GlobalAsm(item_id) => {
                 rustc_codegen_ssa::base::codegen_global_asm(
@@ -637,7 +637,7 @@ fn module_codegen(
                     &profiler,
                     cgu_name,
                     module,
-                    cx.debug_context,
+                    None, //cx.debug_context,
                     global_asm_object_file,
                     &producer,
                 )

src/driver/jit.rs

@@ -144,7 +144,7 @@ fn codegen_and_compile_fn<'tcx>(
         let codegened_func = crate::base::codegen_fn(
             tcx,
             cx,
-            &mut TypeDebugContext::default(),
+            //&mut TypeDebugContext::default(),
             cached_func,
             module,
             instance,

src/lib.rs

@@ -127,22 +127,22 @@ impl<F: Fn() -> String> Drop for PrintOnPanic<F> {
 /// inside a single codegen unit with the exception of the Cranelift [`Module`](cranelift_module::Module).
 struct CodegenCx {
     should_write_ir: bool,
-    debug_context: Option<DebugContext>,
+    //debug_context: Option<DebugContext>,
     cgu_name: Symbol,
 }
 
 impl CodegenCx {
     fn new(tcx: TyCtxt<'_>, isa: &dyn TargetIsa, debug_info: bool, cgu_name: Symbol) -> Self {
         assert_eq!(pointer_ty(tcx), isa.pointer_type());
 
-        let debug_context = if debug_info && !tcx.sess.target.options.is_like_windows {
+        /*let debug_context = if debug_info && !tcx.sess.target.options.is_like_windows {
             Some(DebugContext::new(tcx, isa, cgu_name.as_str()))
         } else {
             None
-        };
+        };*/
         CodegenCx {
             should_write_ir: crate::pretty_clif::should_write_ir(tcx),
-            debug_context,
+            //debug_context: None,
             cgu_name,
         }
     }