Commit c7ec69c9 authored by Isaac Oscar Gariano's avatar Isaac Oscar Gariano

Fixed mangled merge

parent 5ee0ca24
Pipeline #704 passed with stages
in 29 minutes and 4 seconds
......@@ -88,7 +88,6 @@ lazy_static! {
VOID_TYPE.clone(),
REF_VOID_TYPE.clone(),
IREF_VOID_TYPE.clone(),
];
];
}
......
......@@ -1952,13 +1952,8 @@ pub fn emit_ireg_value(backend: &mut CodeGenerator, pv: &P<Value>, f_context: &m
&Constant::FuncRef(func_id) => {
let tmp = make_temporary(f_context, pv.ty.clone(), vm);
<<<<<<< HEAD
let mem = make_value_symbolic(vm.get_func_name(func_id), true, &ADDRESS_TYPE, vm);
emit_calculate_address(backend, &tmp, &mem, vm);
=======
let mem = make_value_symbolic(vm.get_name_for_func(func_id), true, &ADDRESS_TYPE, vm);
emit_calculate_address(backend, &tmp, &mem, f_context, vm);
>>>>>>> 5aad05d054e79db08724c0bcba77d78d71174f08
emit_calculate_address(backend, &tmp, &mem, vm);
tmp
},
&Constant::NullRef => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment