diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:21:36 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:21:36 +0000 |
| commit | 5f45e2222ef7521a9debe652824d587aaff4ca66 (patch) | |
| tree | 133fbe3ef3eb0f7ce6b151db1ed86bfd9c4abb60 /js/src/jit/MCallOptimize.cpp | |
| parent | a42bed2e9a78715889240ff900e2391bef923285 (diff) | |
| parent | d7359c38b197c221c43def1e24cb48d4aee51bba (diff) | |
| download | UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.gz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.lz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.xz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.zip | |
Merge branch 'master' into remove-unboxed
Diffstat (limited to 'js/src/jit/MCallOptimize.cpp')
| -rw-r--r-- | js/src/jit/MCallOptimize.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 0d5779cee..fed5aefe5 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -621,7 +621,8 @@ IonBuilder::inlineArrayPopShift(CallInfo& callInfo, MArrayPopShift::Mode mode) return InliningStatus_NotInlined; } - if (ArrayPrototypeHasIndexedProperty(this, script())) { + // Watch out for extra indexed properties on the object or its prototype. + if (ElementAccessHasExtraIndexedProperty(this, obj)) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; } @@ -748,14 +749,8 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags(constraints(), OBJECT_FLAG_SPARSE_INDEXES | - OBJECT_FLAG_LENGTH_OVERFLOW)) - { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } - if (ArrayPrototypeHasIndexedProperty(this, script())) { + if (ElementAccessHasExtraIndexedProperty(this, obj)) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; } @@ -825,15 +820,9 @@ IonBuilder::inlineArraySlice(CallInfo& callInfo) const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags(constraints(), OBJECT_FLAG_SPARSE_INDEXES | - OBJECT_FLAG_LENGTH_OVERFLOW)) - { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } - // Watch out for indexed properties on the prototype. - if (ArrayPrototypeHasIndexedProperty(this, script())) { + // Watch out for indexed properties on the object or its prototype. + if (ElementAccessHasExtraIndexedProperty(this, obj)) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; } |