T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change dfg.inst_results to return a slice.

Browse Source 
Now we can access instruction results and arguments as well as EBB
arguments as slices.

Delete the Values iterator which was traversing the linked lists of
values. It is no longer needed.
This commit is contained in:
Jakob Stoklund Olesen
2017-04-11 16:53:54 -07:00
parent 3a36435c3b
commit 322a8db839
9 changed files with 33 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cretonne/src/legalizer/boundary.rs
View File

@@ -302,11 +302,9 @@ fn convert_to_abi<PutArg>(dfg: &mut DataFlowGraph,
}
/// Check if a sequence of arguments match a desired sequence of argument types.
fn check_arg_types<Args>(dfg: &DataFlowGraph, args: Args, types: &[ArgumentType]) -> bool
where Args: IntoIterator<Item = Value>
{
fn check_arg_types(dfg: &DataFlowGraph, args: &[Value], types: &[ArgumentType]) -> bool {
let mut n = 0;
for arg in args {
for &arg in args {
match types.get(n) {
Some(&ArgumentType { value_type, .. }) => {
if dfg.value_type(arg) != value_type {
@@ -335,7 +333,7 @@ fn check_call_signature(dfg: &DataFlowGraph, inst: Inst) -> Result<(), SigRef> {
};
let sig = &dfg.signatures[sig_ref];
if check_arg_types(dfg, args.iter().cloned(), &sig.argument_types[..]) &&
if check_arg_types(dfg, args, &sig.argument_types[..]) &&
check_arg_types(dfg, dfg.inst_results(inst), &sig.return_types[..]) {
// All types check out.
Ok(())
@@ -347,9 +345,7 @@ fn check_call_signature(dfg: &DataFlowGraph, inst: Inst) -> Result<(), SigRef> {
/// Check if the arguments of the return `inst` match the signature.
fn check_return_signature(dfg: &DataFlowGraph, inst: Inst, sig: &Signature) -> bool {
check_arg_types(dfg,
dfg.inst_variable_args(inst).iter().cloned(),
&sig.return_types)
check_arg_types(dfg, dfg.inst_variable_args(inst), &sig.return_types)
}
/// Insert ABI conversion code for the arguments to the call or return instruction at `pos`.