chemspill: M1537924 M1538006 (backported to ESR45)

This commit is contained in:
Cameron Kaiser 2019-03-23 11:39:13 -07:00
parent 860cb0f37a
commit b22dfbd773
2 changed files with 7 additions and 6 deletions

View File

@ -5554,8 +5554,10 @@ jit::PropertyWriteNeedsTypeBarrier(TempAllocator& alloc, CompilerConstraintList*
bool success = true;
for (size_t i = 0; i < types->getObjectCount(); i++) {
TypeSet::ObjectKey* key = types->getObject(i);
if (!key || key->unknownProperties())
if (!key)
continue;
if (!key->hasStableClassAndProto(constraints))
return true;
// TI doesn't track TypedArray indexes and should never insert a type
// barrier for them.
@ -5607,8 +5609,11 @@ jit::PropertyWriteNeedsTypeBarrier(TempAllocator& alloc, CompilerConstraintList*
TypeSet::ObjectKey* excluded = nullptr;
for (size_t i = 0; i < types->getObjectCount(); i++) {
TypeSet::ObjectKey* key = types->getObject(i);
if (!key || key->unknownProperties())
if (!key)
continue;
if (!key->hasStableClassAndProto(constraints))
return true;
if (!name && IsAnyTypedArrayClass(key->clasp()))
continue;

View File

@ -9503,10 +9503,6 @@ class MArraySlice
return unboxedType_;
}
AliasSet getAliasSet() const override {
return AliasSet::Store(AliasSet::BoxedOrUnboxedElements(unboxedType()) |
AliasSet::ObjectFields);
}
bool possiblyCalls() const override {
return true;
}