Bug 1331939 - Rename two other instances of GlobalFlags. a=bustage
☠☠ backed out by ecec7302f40d ☠ ☠
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 06 Feb 2017 12:01:28 -0500
changeset 480368 f78e406f5ef5cf13522b70e981561b1280dc917a
parent 480367 cc219ce6b182fef7493409735c6be3e463fde90f
child 480369 ecec7302f40ddd26c5f3c6cb48eac35b8977d772
push id44524
push usermartin.thomson@gmail.com
push dateWed, 08 Feb 2017 05:10:11 +0000
reviewersbustage
bugs1331939
milestone52.0
Bug 1331939 - Rename two other instances of GlobalFlags. a=bustage
js/src/wasm/WasmBinaryFormat.cpp
--- a/js/src/wasm/WasmBinaryFormat.cpp
+++ b/js/src/wasm/WasmBinaryFormat.cpp
@@ -405,20 +405,20 @@ wasm::DecodeGlobalType(Decoder& d, ValTy
 {
     if (!DecodeValType(d, ModuleKind::Wasm, type))
         return false;
 
     uint32_t flags;
     if (!d.readVarU32(&flags))
         return d.fail("expected global flags");
 
-    if (flags & ~uint32_t(GlobalFlags::AllowedMask))
+    if (flags & ~uint32_t(GlobalTypeImmediate::AllowedMask))
         return d.fail("unexpected bits set in global flags");
 
-    *isMutable = flags & uint32_t(GlobalFlags::IsMutable);
+    *isMutable = flags & uint32_t(GlobalTypeImmediate::IsMutable);
     return true;
 }
 
 bool
 wasm::DecodeInitializerExpression(Decoder& d, const GlobalDescVector& globals, ValType expected,
                                   InitExpr* init)
 {
     uint16_t op;