Skip to content

Commit cad983c

Browse files
aheejinaheejin
authored
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.
1 parent bdd96e8 commit cad983c

File tree

11 files changed

+3
-37
lines changed

11 files changed

+3
-37
lines changed

‎src/ir/branch-utils.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,10 @@ template<typename T> void operateOnScopeNameUses(Expression* expr, T func) {
5454
#define DELEGATE_FIELD_INT(id, field)
5555
#define DELEGATE_FIELD_LITERAL(id, field)
5656
#define DELEGATE_FIELD_NAME(id, field)
57-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
5857
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
5958
#define DELEGATE_FIELD_TYPE(id, field)
6059
#define DELEGATE_FIELD_HEAPTYPE(id, field)
6160
#define DELEGATE_FIELD_ADDRESS(id, field)
62-
#define DELEGATE_FIELD_CHILD_VECTOR(id, field)
63-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
6461

6562
#include "wasm-delegations-fields.def"
6663
}
@@ -110,20 +107,18 @@ template<typename T> void operateOnScopeNameDefs(Expression* expr, T func) {
110107

111108
#define DELEGATE_START(id) [[maybe_unused]] auto* cast = expr->cast<id>();
112109

110+
#define DELEGATE_GET_FIELD(id, field) cast->field
111+
113112
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field) func(cast->field)
114113

115114
#define DELEGATE_FIELD_CHILD(id, field)
116115
#define DELEGATE_FIELD_INT(id, field)
117116
#define DELEGATE_FIELD_LITERAL(id, field)
118117
#define DELEGATE_FIELD_NAME(id, field)
119-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
120118
#define DELEGATE_FIELD_TYPE(id, field)
121119
#define DELEGATE_FIELD_HEAPTYPE(id, field)
122120
#define DELEGATE_FIELD_ADDRESS(id, field)
123-
#define DELEGATE_FIELD_CHILD_VECTOR(id, field)
124-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
125121
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
126-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
127122

128123
#include "wasm-delegations-fields.def"
129124
}

‎src/ir/iteration.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,10 @@ template<class Specific> class AbstractChildIterator {
102102
}
103103

104104
#define DELEGATE_FIELD_INT(id, field)
105-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
106105
#define DELEGATE_FIELD_LITERAL(id, field)
107106
#define DELEGATE_FIELD_NAME(id, field)
108-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
109107
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
110108
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
111-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
112109
#define DELEGATE_FIELD_TYPE(id, field)
113110
#define DELEGATE_FIELD_HEAPTYPE(id, field)
114111
#define DELEGATE_FIELD_ADDRESS(id, field)

‎src/ir/memory-utils.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,10 @@ bool flatten(Module& wasm) {
5050
#define DELEGATE_FIELD_CHILD(id, field)
5151
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
5252
#define DELEGATE_FIELD_INT(id, field)
53-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
5453
#define DELEGATE_FIELD_LITERAL(id, field)
5554
#define DELEGATE_FIELD_NAME(id, field)
56-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
5755
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
5856
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
59-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
6057
#define DELEGATE_FIELD_ADDRESS(id, field)
6158

6259
#define DELEGATE_FIELD_NAME_KIND(id, field, kind) \

‎src/ir/properties.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,10 @@ inline Index getNumChildren(Expression* curr) {
447447
}
448448

449449
#define DELEGATE_FIELD_INT(id, field)
450-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
451450
#define DELEGATE_FIELD_LITERAL(id, field)
452451
#define DELEGATE_FIELD_NAME(id, field)
453-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
454452
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
455453
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
456-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
457454
#define DELEGATE_FIELD_TYPE(id, field)
458455
#define DELEGATE_FIELD_HEAPTYPE(id, field)
459456
#define DELEGATE_FIELD_ADDRESS(id, field)

‎src/ir/type-updating.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,10 @@ void GlobalTypeRewriter::mapTypes(const TypeMap& oldToNewTypes) {
229229
#define DELEGATE_FIELD_CHILD(id, field)
230230
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
231231
#define DELEGATE_FIELD_INT(id, field)
232-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
233232
#define DELEGATE_FIELD_LITERAL(id, field)
234233
#define DELEGATE_FIELD_NAME(id, field)
235-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
236234
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
237235
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
238-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
239236
#define DELEGATE_FIELD_ADDRESS(id, field)
240237

241238
#include "wasm-delegations-fields.def"

‎src/passes/MemoryPacking.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,13 +481,10 @@ void MemoryPacking::getSegmentReferrers(Module* module,
481481
#define DELEGATE_FIELD_CHILD(id, field)
482482
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
483483
#define DELEGATE_FIELD_INT(id, field)
484-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
485484
#define DELEGATE_FIELD_LITERAL(id, field)
486485
#define DELEGATE_FIELD_NAME(id, field)
487-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
488486
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
489487
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
490-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
491488
#define DELEGATE_FIELD_ADDRESS(id, field)
492489

493490
#define DELEGATE_FIELD_NAME_KIND(id, field, kind) \

‎src/passes/RemoveUnusedModuleElements.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,10 @@ struct ReferenceFinder
8888
#define DELEGATE_FIELD_CHILD(id, field)
8989
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
9090
#define DELEGATE_FIELD_INT(id, field)
91-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
9291
#define DELEGATE_FIELD_LITERAL(id, field)
9392
#define DELEGATE_FIELD_NAME(id, field)
94-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
9593
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
9694
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
97-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
9895
#define DELEGATE_FIELD_ADDRESS(id, field)
9996

10097
#define DELEGATE_FIELD_NAME_KIND(id, field, kind) \

‎src/tools/wasm-merge.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,10 @@ void updateNames(Module& wasm, KindNameUpdates& kindNameUpdates) {
202202
#define DELEGATE_FIELD_CHILD(id, field)
203203
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
204204
#define DELEGATE_FIELD_INT(id, field)
205-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
206205
#define DELEGATE_FIELD_LITERAL(id, field)
207206
#define DELEGATE_FIELD_NAME(id, field)
208-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
209207
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
210208
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
211-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
212209
#define DELEGATE_FIELD_ADDRESS(id, field)
213210

214211
#define DELEGATE_FIELD_NAME_KIND(id, field, kind) \

‎src/tools/wasm-metadce.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,10 @@ struct MetaDCEGraph {
216216
#define DELEGATE_FIELD_CHILD(id, field)
217217
#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
218218
#define DELEGATE_FIELD_INT(id, field)
219-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
220219
#define DELEGATE_FIELD_LITERAL(id, field)
221220
#define DELEGATE_FIELD_NAME(id, field)
222-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
223221
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
224222
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
225-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
226223
#define DELEGATE_FIELD_ADDRESS(id, field)
227224

228225
#define DELEGATE_FIELD_NAME_KIND(id, field, kind) \

‎src/wasm-traversal.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,10 @@ struct PostWalker : public Walker<SubType, VisitorType> {
383383
self->maybePushTask(SubType::scan, &cast->field);
384384

385385
#define DELEGATE_FIELD_INT(id, field)
386-
#define DELEGATE_FIELD_INT_ARRAY(id, field)
387386
#define DELEGATE_FIELD_LITERAL(id, field)
388387
#define DELEGATE_FIELD_NAME(id, field)
389-
#define DELEGATE_FIELD_NAME_VECTOR(id, field)
390388
#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
391389
#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
392-
#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
393390
#define DELEGATE_FIELD_TYPE(id, field)
394391
#define DELEGATE_FIELD_HEAPTYPE(id, field)
395392
#define DELEGATE_FIELD_ADDRESS(id, field)

0 commit comments

Comments
 (0)