Bug 1331939 Rename GlobalFlags to GlobalTypeImmediate to fix MinGW build r=luke

MozReview-Commit-ID: 1jXd3LUZ0dT

--HG--
extra : rebase_source : 7e1ef586f061a181c4e727a7036f568156987ce9
This commit is contained in:
Tom Ritter 2017-01-24 15:00:42 -06:00
parent 3a74451338
commit 9deebf811c
3 changed files with 4 additions and 4 deletions

View File

@ -103,7 +103,7 @@ enum class DefinitionKind
Global = 0x03
};
enum class GlobalFlags
enum class GlobalTypeImmediate
{
IsMutable = 0x1,
AllowedMask = 0x1

View File

@ -4437,7 +4437,7 @@ static bool
EncodeGlobalType(Encoder& e, const AstGlobal* global)
{
return e.writeValType(global->type()) &&
e.writeVarU32(global->isMutable() ? uint32_t(GlobalFlags::IsMutable) : 0);
e.writeVarU32(global->isMutable() ? uint32_t(GlobalTypeImmediate::IsMutable) : 0);
}
static bool

View File

@ -914,10 +914,10 @@ DecodeGlobalType(Decoder& d, ValType* type, bool* isMutable)
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;
}