From d2f54b40e736cdee2a0ff9fc15e9323ccb9d7c20 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Sat, 19 Mar 2022 02:29:35 +0000
Subject: Add support for extended-const proposal (#4529)

See https://github.com/WebAssembly/extended-const
---
 src/ir/global-utils.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/ir/global-utils.h')

diff --git a/src/ir/global-utils.h b/src/ir/global-utils.h
index 26aec7790..ca00047a0 100644
--- a/src/ir/global-utils.h
+++ b/src/ir/global-utils.h
@@ -53,20 +53,18 @@ getGlobalInitializedToImport(Module& wasm, Name module, Name base) {
   return ret;
 }
 
-inline bool canInitializeGlobal(Expression* curr) {
+inline bool canInitializeGlobal(Expression* curr, FeatureSet features) {
   if (auto* tuple = curr->dynCast<TupleMake>()) {
     for (auto* op : tuple->operands) {
-      if (!canInitializeGlobal(op)) {
+      if (!canInitializeGlobal(op, features)) {
         return false;
       }
     }
     return true;
   }
-  if (Properties::isSingleConstantExpression(curr) || curr->is<GlobalGet>() ||
-      curr->is<RttCanon>() || curr->is<RttSub>() || curr->is<StructNew>() ||
-      curr->is<ArrayNew>() || curr->is<ArrayInit>() || curr->is<I31New>()) {
+  if (Properties::isValidInConstantExpression(curr, features)) {
     for (auto* child : ChildIterator(curr)) {
-      if (!canInitializeGlobal(child)) {
+      if (!canInitializeGlobal(child, features)) {
         return false;
       }
     }
-- 
cgit v1.2.3