From cad983c975a05bc262437a6d7ed3a61020ef4e8d Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Thu, 14 Dec 2023 10:34:39 -0800 Subject: Remove empty _ARRAY/_VECTOR defines (NFC) (#6182) `_VECTOR` or `_ARRAY` defines in `wasm-delegations-fields.def` are supposed to be defined in terms of their non-vector/array counterparts when undefined. This removes empty `_VECTOR`/`_ARRAY` defines when including `wasm-delegations-fields.def`, while adding definitions for `DELEGATE_GET_FIELD` in case it is missing. --- src/ir/branch-utils.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/ir/branch-utils.h') diff --git a/src/ir/branch-utils.h b/src/ir/branch-utils.h index 3527f1b36..9598e2830 100644 --- a/src/ir/branch-utils.h +++ b/src/ir/branch-utils.h @@ -54,13 +54,10 @@ template void operateOnScopeNameUses(Expression* expr, T func) { #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_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" } @@ -110,20 +107,18 @@ template void operateOnScopeNameDefs(Expression* expr, T func) { #define DELEGATE_START(id) [[maybe_unused]] auto* cast = expr->cast(); +#define DELEGATE_GET_FIELD(id, field) cast->field + #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_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