Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1477329 - Avoid static casts for coercing TypeDef nodes. r=jseward

Browse Source 
There's no reason to use static_cast, we already have transfer functions on the
AstTypeDef node that should be used.

--HG--
extra : rebase_source : 07674fd96172143542c4f06c1048c8b5b0e82a90
extra : amend_source : f15851b91133f694ad209ce1feae65c5e1551747
This commit is contained in:
Lars T Hansen 2018-07-24 09:04:26 +02:00
parent 46679701af
commit 5c37d5f314
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/wasm/WasmAST.h
View File

@ -1334,6 +1334,13 @@ class AstModule : public AstNode
bool append(AstStructType* str) {
return types_.append(str);
}
bool append(AstTypeDef* td) {
if (td->isFuncType())
return append(&td->asFuncType());
if (td->isStructType())
return append(&td->asStructType());
MOZ_CRASH("Bad type");
}
bool append(AstImport* imp) {
switch (imp->kind()) {
case DefinitionKind::Function:

20
js/src/wasm/WasmTextToBinary.cpp
View File

@ -4046,7 +4046,7 @@ ParseModule(const char16_t* text, uintptr_t stackLimit, LifoAlloc& lifo, UniqueC
AstTypeDef* typeDef = ParseTypeDef(c);
if (!typeDef)
return nullptr;
if (!module->append(static_cast<AstFuncType*>(typeDef)))
if (!module->append(typeDef))
return nullptr;
break;
}
@ -4729,26 +4729,30 @@ ResolveModule(LifoAlloc& lifo, AstModule* module, UniqueChars* error)
for (size_t i = 0; i < numTypes; i++) {
AstTypeDef* td = module->types()[i];
if (td->isFuncType()) {
AstFuncType* funcType = static_cast<AstFuncType*>(td);
AstFuncType* funcType = &td->asFuncType();
if (!r.registerFuncTypeName(funcType->name(), i))
return r.fail("duplicate signature");
} else if (td->isStructType()) {
AstStructType* structType = static_cast<AstStructType*>(td);
AstStructType* structType = &td->asStructType();
if (!r.registerTypeName(structType->name(), i))
return r.fail("duplicate type name");
} else {
MOZ_CRASH("Bad type");
}
}
for (size_t i = 0; i < numTypes; i++) {
AstTypeDef* td = module->types()[i];
if (td->isFuncType()) {
AstFuncType* funcType = static_cast<AstFuncType*>(td);
AstFuncType* funcType = &td->asFuncType();
if (!ResolveSignature(r, *funcType))
return false;
} else if (td->isStructType()) {
AstStructType* structType = static_cast<AstStructType*>(td);
AstStructType* structType = &td->asStructType();
if (!ResolveStruct(r, *structType))
return false;
} else {
MOZ_CRASH("Bad type");
}
}
@ -5392,7 +5396,7 @@ EncodeTypeSection(Encoder& e, AstModule& module)
for (AstTypeDef* td : module.types()) {
if (td->isFuncType()) {
AstFuncType* funcType = static_cast<AstFuncType*>(td);
AstFuncType* funcType = &td->asFuncType();
if (!e.writeVarU32(uint32_t(TypeCode::Func)))
return false;
@ -5412,7 +5416,7 @@ EncodeTypeSection(Encoder& e, AstModule& module)
return false;
}
} else if (td->isStructType()) {
AstStructType* st = static_cast<AstStructType*>(td);
AstStructType* st = &td->asStructType();
if (!e.writeVarU32(uint32_t(TypeCode::Struct)))
return false;
@ -5428,7 +5432,7 @@ EncodeTypeSection(Encoder& e, AstModule& module)
return false;
}
} else {
MOZ_CRASH();
MOZ_CRASH("Bad type");
}
}