Bug 1234425 - Skip accessor IC frames in GetPcScript. r=h4writer

This commit is contained in:
Jan de Mooij 2016-01-13 22:05:03 +01:00
parent 970ebd64d3
commit 1cddd03808
2 changed files with 5 additions and 2 deletions

View File

@ -174,6 +174,9 @@ class JitFrameIterator
bool isIonStubMaybeUnwound() const {
return type_ == JitFrame_IonStub || type_ == JitFrame_Unwound_IonStub;
}
bool isIonAccessorICMaybeUnwound() const {
return type_ == JitFrame_IonAccessorIC || type_ == JitFrame_Unwound_IonAccessorIC;
}
bool isBailoutJS() const {
return type_ == JitFrame_Bailout;
}

View File

@ -1630,11 +1630,11 @@ GetPcScript(JSContext* cx, JSScript** scriptRes, jsbytecode** pcRes)
MOZ_ASSERT(it.isBaselineStub() || it.isBaselineJS() || it.isIonJS());
}
// Skip Baseline or Ion stub frames.
// Skip Baseline/Ion stub and accessor IC frames.
if (it.isBaselineStubMaybeUnwound()) {
++it;
MOZ_ASSERT(it.isBaselineJS());
} else if (it.isIonStubMaybeUnwound()) {
} else if (it.isIonStubMaybeUnwound() || it.isIonAccessorICMaybeUnwound()) {
++it;
MOZ_ASSERT(it.isIonJS());
}