From 37c35e95b4ead257619cddeb64e44a62aac035f4 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 6 Oct 2021 18:07:49 -0700 Subject: Rename field names from "name" to "field" in DELEGATE macros (#4216) Clearer this way. --- src/ir/branch-utils.h | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'src/ir/branch-utils.h') diff --git a/src/ir/branch-utils.h b/src/ir/branch-utils.h index 57bad2fb9..25bfd9255 100644 --- a/src/ir/branch-utils.h +++ b/src/ir/branch-utils.h @@ -50,22 +50,22 @@ template void operateOnScopeNameUses(Expression* expr, T func) { auto* cast = expr->cast(); \ WASM_UNUSED(cast); -#define DELEGATE_GET_FIELD(id, name) cast->name - -#define DELEGATE_FIELD_SCOPE_NAME_USE(id, name) func(cast->name); - -#define DELEGATE_FIELD_CHILD(id, name) -#define DELEGATE_FIELD_INT(id, name) -#define DELEGATE_FIELD_LITERAL(id, name) -#define DELEGATE_FIELD_NAME(id, name) -#define DELEGATE_FIELD_NAME_VECTOR(id, name) -#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, name) -#define DELEGATE_FIELD_SIGNATURE(id, name) -#define DELEGATE_FIELD_TYPE(id, name) -#define DELEGATE_FIELD_HEAPTYPE(id, name) -#define DELEGATE_FIELD_ADDRESS(id, name) -#define DELEGATE_FIELD_CHILD_VECTOR(id, name) -#define DELEGATE_FIELD_INT_ARRAY(id, name) +#define DELEGATE_GET_FIELD(id, field) cast->field + +#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field) func(cast->field); + +#define DELEGATE_FIELD_CHILD(id, field) +#define DELEGATE_FIELD_INT(id, field) +#define DELEGATE_FIELD_LITERAL(id, field) +#define DELEGATE_FIELD_NAME(id, field) +#define DELEGATE_FIELD_NAME_VECTOR(id, field) +#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field) +#define DELEGATE_FIELD_SIGNATURE(id, field) +#define DELEGATE_FIELD_TYPE(id, field) +#define DELEGATE_FIELD_HEAPTYPE(id, field) +#define DELEGATE_FIELD_ADDRESS(id, field) +#define DELEGATE_FIELD_CHILD_VECTOR(id, field) +#define DELEGATE_FIELD_INT_ARRAY(id, field) #include "wasm-delegations-fields.def" } @@ -117,21 +117,21 @@ template void operateOnScopeNameDefs(Expression* expr, T func) { auto* cast = expr->cast(); \ WASM_UNUSED(cast); -#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, name) func(cast->name) - -#define DELEGATE_FIELD_CHILD(id, name) -#define DELEGATE_FIELD_INT(id, name) -#define DELEGATE_FIELD_LITERAL(id, name) -#define DELEGATE_FIELD_NAME(id, name) -#define DELEGATE_FIELD_NAME_VECTOR(id, name) -#define DELEGATE_FIELD_SIGNATURE(id, name) -#define DELEGATE_FIELD_TYPE(id, name) -#define DELEGATE_FIELD_HEAPTYPE(id, name) -#define DELEGATE_FIELD_ADDRESS(id, name) -#define DELEGATE_FIELD_CHILD_VECTOR(id, name) -#define DELEGATE_FIELD_INT_ARRAY(id, name) -#define DELEGATE_FIELD_SCOPE_NAME_USE(id, name) -#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, name) +#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field) func(cast->field) + +#define DELEGATE_FIELD_CHILD(id, field) +#define DELEGATE_FIELD_INT(id, field) +#define DELEGATE_FIELD_LITERAL(id, field) +#define DELEGATE_FIELD_NAME(id, field) +#define DELEGATE_FIELD_NAME_VECTOR(id, field) +#define DELEGATE_FIELD_SIGNATURE(id, field) +#define DELEGATE_FIELD_TYPE(id, field) +#define DELEGATE_FIELD_HEAPTYPE(id, field) +#define DELEGATE_FIELD_ADDRESS(id, field) +#define DELEGATE_FIELD_CHILD_VECTOR(id, field) +#define DELEGATE_FIELD_INT_ARRAY(id, field) +#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field) +#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field) #include "wasm-delegations-fields.def" } -- cgit v1.2.3