Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1432168 - Make guardType(..., JSVAL_TYPE_DOUBLE) check for Double, and not Number. r=tcampbell

Browse Source 
To make this change, replace calls to guardType that currently have DOUBLE as the value
with ones that use a new guardNumber, which tests for Numbers instead.
This commit is contained in:
Matthew Gaudet 2018-01-26 09:24:52 -05:00
parent 8165be667f
commit 6caae4c219
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jit/CacheIR.cpp
View File

@ -4143,7 +4143,11 @@ TypeOfIRGenerator::tryAttachPrimitive(ValOperandId valId)
if (!val_.isPrimitive())
return false;
writer.guardType(valId, val_.isNumber() ? JSVAL_TYPE_DOUBLE : val_.extractNonDoubleType());
if (val_.isNumber())
writer.guardIsNumber(valId);
else
writer.guardType(valId, val_.extractNonDoubleType());
writer.loadStringResult(TypeName(js::TypeOfValue(val_), cx_->names()));
writer.returnFromIC();

4
js/src/jit/CacheIR.h
View File

@ -169,6 +169,7 @@ extern const char* CacheKindNames[];
_(GuardIsNullOrUndefined) \
_(GuardIsString) \
_(GuardIsSymbol) \
_(GuardIsNumber) \
_(GuardIsInt32Index) \
_(GuardType) \
_(GuardShape) \
@ -526,6 +527,9 @@ class MOZ_RAII CacheIRWriter : public JS::CustomAutoRooter
writeOperandId(res);
return res;
}
void guardIsNumber(ValOperandId val) {
writeOpWithOperandId(CacheOp::GuardIsNumber, val);
}
void guardType(ValOperandId val, JSValueType type) {
writeOpWithOperandId(CacheOp::GuardType, val);
static_assert(sizeof(type) == sizeof(uint8_t), "JSValueType should fit in a byte");

21
js/src/jit/CacheIRCompiler.cpp
View File

@ -1206,6 +1206,25 @@ CacheIRCompiler::emitFailurePath(size_t index)
return true;
}
bool
CacheIRCompiler::emitGuardIsNumber()
{
ValOperandId inputId = reader.valOperandId();
JSValueType knownType = allocator.knownType(inputId);
// Doubles and ints are numbers!
if (knownType == JSVAL_TYPE_DOUBLE || knownType == JSVAL_TYPE_INT32)
return true;
ValueOperand input = allocator.useValueRegister(masm, inputId);
FailurePath* failure;
if (!addFailurePath(&failure))
return false;
masm.branchTestNumber(Assembler::NotEqual, input, failure->label());
return true;
}
bool
CacheIRCompiler::emitGuardIsObject()
{
@ -1372,7 +1391,7 @@ CacheIRCompiler::emitGuardType()
masm.branchTestInt32(Assembler::NotEqual, input, failure->label());
break;
case JSVAL_TYPE_DOUBLE:
masm.branchTestNumber(Assembler::NotEqual, input, failure->label());
masm.branchTestDouble(Assembler::NotEqual, input, failure->label());
break;
case JSVAL_TYPE_BOOLEAN:
masm.branchTestBoolean(Assembler::NotEqual, input, failure->label());

1
js/src/jit/CacheIRCompiler.h
View File

@ -20,6 +20,7 @@ namespace jit {
_(GuardIsObjectOrNull) \
_(GuardIsString) \
_(GuardIsSymbol) \
_(GuardIsNumber) \
_(GuardIsInt32Index) \
_(GuardType) \
_(GuardClass) \