Cleanup

Author: antoyo

src/context.rs

@@ -412,29 +412,6 @@ impl<'gcc, 'tcx> MiscMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
                         };
                     let func = self.declare_func(name, self.type_i32(), &[], true);
 
-                    // NOTE: using a weak alias to rust_eh_personality doesn't seem to work
-                    // (perhaps because it is not exported from the object file?). So
-                    // create a weak wrapper function.
-                    /*let void_ptr_type = self.context.new_type::<*mut ()>();
-                    let param1 = self.context.new_parameter(None, self.type_i32(), "state");
-                    let param2 = self.context.new_parameter(None, void_ptr_type, "exception_object");
-                    let param3 = self.context.new_parameter(None, void_ptr_type, "context");
-                    let gcc_func = self.context.new_function(None, FunctionType::Exported, self.type_i32(), &[param1, param2, param3], "__gcc_personality_v0", false);
-                    gcc_func.add_attribute(FnAttribute::Weak);
-                    let block = gcc_func.new_block("block");
-                    block.end_with_return(None, self.context.new_call(None, func, &[param1.to_rvalue(), param2.to_rvalue(), param3.to_rvalue()]));*/
-
-                    // FIXME FIXME FIXME: the handling of aliases doesn't seem to work in
-                    // libgccjit.
-                    // Probably because the alias needs to be in the crate where
-                    // rust_eh_personality is defined. Here, we only create an extern for
-                    // rust_eh_personality.
-                    /*
-                    let gcc_func = self.context.new_function(None, FunctionType::Extern, self.type_i32(), &[], "__gcc_personality_v0", true);
-                    gcc_func.add_attribute(FnAttribute::Weak);
-                    gcc_func.add_attribute(FnAttribute::Alias("rust_eh_personality"));
-                    */
-
                     unsafe { std::mem::transmute(func) }
                 }
             };

src/declare.rs

@@ -122,6 +122,8 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
                 // rust_eh_personality in order to avoid a linker error.
                 // This needs to be weak in order to still allow using the standard
                 // __gcc_personality_v0 when the linking to it.
+                // Since aliases don't work (maybe because of a bug in LTO partitioning?), we
+                // create a wrapper function that calls rust_eh_personality.
 
                 let params: Vec<_> = param_types.into_iter().enumerate()
                     .map(|(index, param)| cx.context.new_parameter(None, *param, &format!("param{}", index))) // TODO(antoyo): set name.
@@ -134,7 +136,6 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
                 // For the crate defining it, that needs to be a weak alias instead.
                 gcc_func.add_attribute(FnAttribute::Weak);
 
-                // TODO: just make a normal wrapper function, calling rust_eh_personality.
                 let block = gcc_func.new_block("start");
                 let mut args = vec![];
                 for param in &params {