Revert "[HACK]"

This reverts commit 4339905.

Author: bjorn3

src/abi/mod.rs

@@ -79,21 +79,6 @@ pub(crate) fn get_function_sig<'tcx>(
     default_call_conv: CallConv,
     inst: Instance<'tcx>,
 ) -> Signature {
-    // FIXME remove this hack
-    if tcx.symbol_name(inst).name == "rust_eh_personality" {
-        return Signature {
-            params: vec![
-                AbiParam::new(types::I32),
-                AbiParam::new(types::I32),
-                AbiParam::new(types::I64),
-                AbiParam::new(types::I64 /* FIXME fx.pointer_type */),
-                AbiParam::new(types::I64 /* FIXME fx.pointer_type */),
-            ],
-            returns: vec![AbiParam::new(types::I32)],
-            call_conv: default_call_conv,
-        };
-    }
-
     assert!(!inst.args.has_infer());
     clif_sig_from_fn_abi(
         tcx,
@@ -314,10 +299,7 @@ pub(crate) fn codegen_fn_prelude<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, start_
     }
 
     assert!(arg_abis_iter.next().is_none(), "ArgAbi left behind");
-    // FIXME remove hack
-    if fx.symbol_name != "rust_eh_personality" {
-        assert!(block_params_iter.next().is_none(), "arg_value left behind");
-    }
+    assert!(block_params_iter.next().is_none(), "arg_value left behind");
 
     self::comments::add_locals_header_comment(fx);
 

src/debuginfo/unwind.rs

@@ -38,8 +38,6 @@ impl UnwindContext {
                 gimli::DW_EH_PE_absptr
             };
 
-            // FIXME only add personality function and lsda when necessary: https://github.com/rust-lang/rust/blob/1f76d219c906f0112bb1872f33aa977164c53fa6/compiler/rustc_codegen_ssa/src/mir/mod.rs#L200-L204
-
             cie.fde_address_encoding = ptr_encoding;
 
             // FIXME only add personality function and lsda when necessary: https://github.com/rust-lang/rust/blob/1f76d219c906f0112bb1872f33aa977164c53fa6/compiler/rustc_codegen_ssa/src/mir/mod.rs#L200-L204