Issue #2307 - Part 3b: Fix build bustage.

This commit is contained in:
Moonchild 2023-09-19 16:53:12 +02:00 • committed by roytam1
commit 45c19ce1c5
3 changed files with 6 additions and 28 deletions

View file

@ -86,14 +86,7 @@ class LIRGeneratorNone : public LIRGeneratorShared
LTableSwitch* newLTableSwitch(LAllocation, LDefinition, MTableSwitch*) { MOZ_CRASH(); } LTableSwitch* newLTableSwitch(LAllocation, LDefinition, MTableSwitch*) { MOZ_CRASH(); }
LTableSwitchV* newLTableSwitchV(MTableSwitch*) { MOZ_CRASH(); } LTableSwitchV* newLTableSwitchV(MTableSwitch*) { MOZ_CRASH(); }
void visitSimdSelect(MSimdSelect* ins) { MOZ_CRASH(); }
void visitSimdSplat(MSimdSplat* ins) { MOZ_CRASH(); }
void visitSimdSwizzle(MSimdSwizzle* ins) { MOZ_CRASH(); }
void visitSimdShuffle(MSimdShuffle* ins) { MOZ_CRASH(); }
void visitSimdValueX4(MSimdValueX4* lir) { MOZ_CRASH(); }
void visitSubstr(MSubstr*) { MOZ_CRASH(); } void visitSubstr(MSubstr*) { MOZ_CRASH(); }
void visitSimdBinaryArith(js::jit::MSimdBinaryArith*) { MOZ_CRASH(); }
void visitSimdBinarySaturating(MSimdBinarySaturating* ins) { MOZ_CRASH(); }
void visitRandom(js::jit::MRandom*) { MOZ_CRASH(); } void visitRandom(js::jit::MRandom*) { MOZ_CRASH(); }
void visitCopySign(js::jit::MCopySign*) { MOZ_CRASH(); } void visitCopySign(js::jit::MCopySign*) { MOZ_CRASH(); }
void visitWasmTruncateToInt64(MWasmTruncateToInt64*) { MOZ_CRASH(); } void visitWasmTruncateToInt64(MWasmTruncateToInt64*) { MOZ_CRASH(); }

View file

@ -813,7 +813,6 @@ class NumLit
NumLit(Which w, const Value& v) : which_(w) { NumLit(Which w, const Value& v) : which_(w) {
u.scalar_ = v; u.scalar_ = v;
MOZ_ASSERT(!isSimd());
} }
Which which() const { Which which() const {
@ -2117,7 +2116,7 @@ IsFloatLiteral(ModuleValidator& m, ParseNode* pn)
} }
static bool static bool
IsNumericLiteral(ModuleValidator& m, ParseNode* pn, bool* isSimd = nullptr); IsNumericLiteral(ModuleValidator& m, ParseNode* pn);
static NumLit static NumLit
ExtractNumericLiteral(ModuleValidator& m, ParseNode* pn); ExtractNumericLiteral(ModuleValidator& m, ParseNode* pn);
@ -2126,7 +2125,7 @@ static inline bool
IsLiteralInt(ModuleValidator& m, ParseNode* pn, uint32_t* u32); IsLiteralInt(ModuleValidator& m, ParseNode* pn, uint32_t* u32);
static bool static bool
IsNumericLiteral(ModuleValidator& m, ParseNode* pn, bool* isSimd) IsNumericLiteral(ModuleValidator& m, ParseNode* pn)
{ {
if (IsNumericNonFloatLiteral(pn) || IsFloatLiteral(m, pn)) if (IsNumericNonFloatLiteral(pn) || IsFloatLiteral(m, pn))
return true; return true;
@ -2319,10 +2318,6 @@ class MOZ_STACK_CLASS FunctionValidator
/***************************************************** Attributes */ /***************************************************** Attributes */
void setUsesSimd() {
fg_.setUsesSimd();
}
void setUsesAtomics() { void setUsesAtomics() {
fg_.setUsesAtomics(); fg_.setUsesAtomics();
} }
@ -3051,13 +3046,9 @@ IsLiteralOrConst(FunctionValidator& f, ParseNode* pn, NumLit* lit)
return true; return true;
} }
bool isSimd = false; if (!IsNumericLiteral(f.m(), pn))
if (!IsNumericLiteral(f.m(), pn, &isSimd))
return false; return false;
if (isSimd)
f.setUsesSimd();
*lit = ExtractNumericLiteral(f.m(), pn); *lit = ExtractNumericLiteral(f.m(), pn);
return true; return true;
} }
@ -4318,10 +4309,7 @@ CheckCoercedCall(FunctionValidator& f, ParseNode* call, Type ret, Type* type)
JS_CHECK_RECURSION_DONT_REPORT(f.cx(), return f.m().failOverRecursed()); JS_CHECK_RECURSION_DONT_REPORT(f.cx(), return f.m().failOverRecursed());
bool isSimd = false; if (IsNumericLiteral(f.m(), call)) {
if (IsNumericLiteral(f.m(), call, &isSimd)) {
if (isSimd)
f.setUsesSimd();
NumLit lit = ExtractNumericLiteral(f.m(), call); NumLit lit = ExtractNumericLiteral(f.m(), call);
if (!f.writeConstExpr(lit)) if (!f.writeConstExpr(lit))
return false; return false;
@ -4852,10 +4840,7 @@ CheckExpr(FunctionValidator& f, ParseNode* expr, Type* type)
{ {
JS_CHECK_RECURSION_DONT_REPORT(f.cx(), return f.m().failOverRecursed()); JS_CHECK_RECURSION_DONT_REPORT(f.cx(), return f.m().failOverRecursed());
bool isSimd = false; if (IsNumericLiteral(f.m(), expr)) {
if (IsNumericLiteral(f.m(), expr, &isSimd)) {
if (isSimd)
f.setUsesSimd();
return CheckNumericLiteral(f, expr, type); return CheckNumericLiteral(f, expr, type);
} }

View file

@ -160,7 +160,7 @@ Instance::callImport(JSContext* cx, uint32_t funcImportIndex, unsigned argc, con
break; break;
} }
default: { default: {
MOZ_ASSERT("unhandled type in callImport"); MOZ_CRASH("unhandled type in callImport");
return false; return false;
} }
} }