wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1022891 - Part 1: Fix IonBailoutIterator for non-top frames. (r=nbp)

Browse Source
This commit is contained in:
Shu-yu Guo 2014-06-12 12:46:17 -07:00
parent e6f41c18a9
commit be6245602f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jit/Bailouts.h
View File

@ -125,11 +125,14 @@ class IonBailoutIterator : public JitFrameIterator
IonBailoutIterator(const JitActivationIterator &activations, const JitFrameIterator &frame);
SnapshotOffset snapshotOffset() const {
JS_ASSERT(topIonScript_);
return snapshotOffset_;
if (topIonScript_)
return snapshotOffset_;
return osiIndex()->snapshotOffset();
}
const MachineState &machineState() const {
return machine_;
const MachineState machineState() const {
if (topIonScript_)
return machine_;
return JitFrameIterator::machineState();
}
size_t topFrameSize() const {
JS_ASSERT(topIonScript_);
@ -141,6 +144,14 @@ class IonBailoutIterator : public JitFrameIterator
return JitFrameIterator::ionScript();
}
IonBailoutIterator &operator++() {
JitFrameIterator::operator++();
// Clear topIonScript_ now that we've advanced past it, so that
// snapshotOffset() and machineState() reflect the current script.
topIonScript_ = nullptr;
return *this;
}
void dump() const;
};