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

Rename take_ebb_args to detach_ebb_args()

Browse Source 
This better matches the detach_secondary_results cousin.

Also rename the converse put_ebb_arg -> attach_ebb_arg.
This commit is contained in:
Jakob Stoklund Olesen
2017-03-15 15:21:57 -07:00
parent d15f25844a
commit db5aead1a5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/cretonne/src/ir/dfg.rs
View File

@@ -549,7 +549,7 @@ impl DataFlowGraph {
num: 0, num: 0,
next: None.into(), next: None.into(),
}); });
self.put_ebb_arg(ebb, val); self.attach_ebb_arg(ebb, val);
val val
} }
@@ -578,9 +578,9 @@ impl DataFlowGraph {
/// processing the list of arguments. /// processing the list of arguments.
/// ///
/// This is a quite low-level operation. Sensible things to do with the detached EBB arguments /// This is a quite low-level operation. Sensible things to do with the detached EBB arguments
/// is to put them back on the same EBB with `put_ebb_arg()` or change them into aliases /// is to put them back on the same EBB with `attach_ebb_arg()` or change them into aliases
/// with `change_to_alias()`. /// with `change_to_alias()`.
pub fn take_ebb_args(&mut self, ebb: Ebb) -> Option<Value> { pub fn detach_ebb_args(&mut self, ebb: Ebb) -> Option<Value> {
let first = self.ebbs[ebb].first_arg.into(); let first = self.ebbs[ebb].first_arg.into();
self.ebbs[ebb].first_arg = None.into(); self.ebbs[ebb].first_arg = None.into();
self.ebbs[ebb].last_arg = None.into(); self.ebbs[ebb].last_arg = None.into();
@@ -591,10 +591,10 @@ impl DataFlowGraph {
/// ///
/// The appended value should already be an EBB argument belonging to `ebb`, but it can't be /// The appended value should already be an EBB argument belonging to `ebb`, but it can't be
/// attached. In practice, this means that it should be one of the values returned from /// attached. In practice, this means that it should be one of the values returned from
/// `take_ebb_args()`. /// `detach_ebb_args()`.
/// ///
/// In almost all cases, you should be using `append_ebb_arg()` instead of this method. /// In almost all cases, you should be using `append_ebb_arg()` instead of this method.
pub fn put_ebb_arg(&mut self, ebb: Ebb, arg: Value) { pub fn attach_ebb_arg(&mut self, ebb: Ebb, arg: Value) {
let arg_num = match self.ebbs[ebb].last_arg.map(|v| v.expand()) { let arg_num = match self.ebbs[ebb].last_arg.map(|v| v.expand()) {
// If last_argument is `None`, we're adding the first EBB argument. // If last_argument is `None`, we're adding the first EBB argument.
None => { None => {
@@ -743,7 +743,7 @@ mod tests {
assert_eq!(ebb.to_string(), "ebb0"); assert_eq!(ebb.to_string(), "ebb0");
assert_eq!(dfg.num_ebb_args(ebb), 0); assert_eq!(dfg.num_ebb_args(ebb), 0);
assert_eq!(dfg.ebb_args(ebb).next(), None); assert_eq!(dfg.ebb_args(ebb).next(), None);
assert_eq!(dfg.take_ebb_args(ebb), None); assert_eq!(dfg.detach_ebb_args(ebb), None);
assert_eq!(dfg.num_ebb_args(ebb), 0); assert_eq!(dfg.num_ebb_args(ebb), 0);
assert_eq!(dfg.ebb_args(ebb).next(), None); assert_eq!(dfg.ebb_args(ebb).next(), None);
@@ -771,16 +771,16 @@ mod tests {
assert_eq!(dfg.value_type(arg2), types::I16); assert_eq!(dfg.value_type(arg2), types::I16);
// Swap the two EBB arguments. // Swap the two EBB arguments.
let take1 = dfg.take_ebb_args(ebb).unwrap(); let take1 = dfg.detach_ebb_args(ebb).unwrap();
assert_eq!(dfg.num_ebb_args(ebb), 0); assert_eq!(dfg.num_ebb_args(ebb), 0);
assert_eq!(dfg.ebb_args(ebb).next(), None); assert_eq!(dfg.ebb_args(ebb).next(), None);
let take2 = dfg.next_ebb_arg(take1).unwrap(); let take2 = dfg.next_ebb_arg(take1).unwrap();
assert_eq!(take1, arg1); assert_eq!(take1, arg1);
assert_eq!(take2, arg2); assert_eq!(take2, arg2);
assert_eq!(dfg.next_ebb_arg(take2), None); assert_eq!(dfg.next_ebb_arg(take2), None);
dfg.put_ebb_arg(ebb, take2); dfg.attach_ebb_arg(ebb, take2);
let arg3 = dfg.append_ebb_arg(ebb, types::I32); let arg3 = dfg.append_ebb_arg(ebb, types::I32);
dfg.put_ebb_arg(ebb, take1); dfg.attach_ebb_arg(ebb, take1);
assert_eq!(dfg.ebb_args(ebb).collect::<Vec<_>>(), [take2, arg3, take1]); assert_eq!(dfg.ebb_args(ebb).collect::<Vec<_>>(), [take2, arg3, take1]);
} }

4
lib/cretonne/src/legalizer.rs
View File

@@ -133,7 +133,7 @@ fn legalize_entry_arguments(func: &mut Function, entry: Ebb) {
// Process the EBB arguments one at a time, possibly replacing one argument with multiple new // Process the EBB arguments one at a time, possibly replacing one argument with multiple new
// ones. We do this by detaching the entry EBB arguments first. // ones. We do this by detaching the entry EBB arguments first.
let mut next_arg = func.dfg.take_ebb_args(entry); let mut next_arg = func.dfg.detach_ebb_args(entry);
while let Some(arg) = next_arg { while let Some(arg) = next_arg {
// Get the next argument before we mutate `arg`. // Get the next argument before we mutate `arg`.
next_arg = func.dfg.next_ebb_arg(arg); next_arg = func.dfg.next_ebb_arg(arg);
@@ -142,7 +142,7 @@ fn legalize_entry_arguments(func: &mut Function, entry: Ebb) {
if arg_type == abi_types[abi_arg].value_type { if arg_type == abi_types[abi_arg].value_type {
// No value translation is necessary, this argument matches the ABI type. // No value translation is necessary, this argument matches the ABI type.
// Just use the original EBB argument value. This is the most common case. // Just use the original EBB argument value. This is the most common case.
func.dfg.put_ebb_arg(entry, arg); func.dfg.attach_ebb_arg(entry, arg);
abi_arg += 1; abi_arg += 1;
} else { } else {
// Compute the value we want for `arg` from the legalized ABI arguments. // Compute the value we want for `arg` from the legalized ABI arguments.