Legalize libcall signatures.

Explicitly legalize signatures created for libcalls.

lib/codegen/src/legalizer/boundary.rs

@@ -33,11 +33,9 @@ use std::vec::Vec;
 /// change the entry block arguments, calls, or return instructions, so this can leave the function
 /// in a state with type discrepancies.
 pub fn legalize_signatures(func: &mut Function, isa: &TargetIsa) {
-    isa.legalize_signature(&mut func.signature, true);
-    func.signature.compute_argument_bytes();
+    legalize_signature(&mut func.signature, true, isa);
     for sig_data in func.dfg.signatures.values_mut() {
-        isa.legalize_signature(sig_data, false);
-        sig_data.compute_argument_bytes();
+        legalize_signature(sig_data, false, isa);
     }
 
     if let Some(entry) = func.layout.entry_block() {
@@ -46,6 +44,20 @@ pub fn legalize_signatures(func: &mut Function, isa: &TargetIsa) {
     }
 }
 
+/// Legalize the libcall signature, which we may generate on the fly after
+/// `legalize_signatures` has been called.
+pub fn legalize_libcall_signature(signature: &mut Signature, isa: &TargetIsa) {
+    legalize_signature(signature, false, isa);
+}
+
+/// Legalize the given signature.
+///
+/// `current` is true if this is the signature for the current function.
+fn legalize_signature(signature: &mut Signature, current: bool, isa: &TargetIsa) {
+    isa.legalize_signature(signature, current);
+    signature.compute_argument_bytes();
+}
+
 /// Legalize the entry block parameters after `func`'s signature has been legalized.
 ///
 /// The legalized signature may contain more parameters than the original signature, and the

lib/codegen/src/legalizer/libcall.rs

@@ -3,6 +3,7 @@
 use ir;
 use ir::{get_libcall_funcref, InstBuilder};
 use isa::TargetIsa;
+use legalizer::boundary::legalize_libcall_signature;
 use std::vec::Vec;
 
 /// Try to expand `inst` as a library call, returning true is successful.
@@ -21,7 +22,10 @@ pub fn expand_as_libcall(inst: ir::Inst, func: &mut ir::Function, isa: &TargetIs
     let funcref = get_libcall_funcref(libcall, func, inst, isa);
     func.dfg.replace(inst).call(funcref, &args);
 
-    // TODO: ask the ISA to legalize the signature.
+    // Ask the ISA to legalize the signature.
+    let fn_data = &func.dfg.ext_funcs[funcref];
+    let sig_data = &mut func.dfg.signatures[fn_data.signature];
+    legalize_libcall_signature(sig_data, isa);
 
     true
 }