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 1143679 - Make TryNoteIterIon behave more like Baseline/interpreter iterators. r=shu

Browse Source
This commit is contained in:
Jan de Mooij 2015-06-03 09:35:30 +02:00
parent f1ff04fd1a
commit ec73ce58fd
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/src/jit/JitFrames.cpp
View File

@ -376,14 +376,20 @@ JitFrameIterator::machineState() const
return machine; return machine;
} }
static uint32_t
NumArgAndLocalSlots(const InlineFrameIterator& frame)
{
JSScript* script = frame.script();
return CountArgSlots(script, frame.maybeCalleeTemplate()) + script->nfixed();
}
static void static void
CloseLiveIteratorIon(JSContext* cx, const InlineFrameIterator& frame, uint32_t localSlot) CloseLiveIteratorIon(JSContext* cx, const InlineFrameIterator& frame, uint32_t stackSlot)
{ {
SnapshotIterator si = frame.snapshotIterator(); SnapshotIterator si = frame.snapshotIterator();
// Skip stack slots until we reach the iterator object. // Skip stack slots until we reach the iterator object.
uint32_t base = CountArgSlots(frame.script(), frame.maybeCalleeTemplate()) + frame.script()->nfixed(); uint32_t skipSlots = NumArgAndLocalSlots(frame) + stackSlot - 1;
uint32_t skipSlots = base + localSlot - 1;
for (unsigned i = 0; i < skipSlots; i++) for (unsigned i = 0; i < skipSlots; i++)
si.skip(); si.skip();
@ -397,17 +403,26 @@ CloseLiveIteratorIon(JSContext* cx, const InlineFrameIterator& frame, uint32_t l
UnwindIteratorForUncatchableException(cx, obj); UnwindIteratorForUncatchableException(cx, obj);
} }
class IgnoreStackDepthOp class IonFrameStackDepthOp
{ {
uint32_t depth_;
public: public:
uint32_t operator()() { return UINT32_MAX; } explicit IonFrameStackDepthOp(const InlineFrameIterator& frame) {
uint32_t base = NumArgAndLocalSlots(frame);
SnapshotIterator si = frame.snapshotIterator();
MOZ_ASSERT(si.numAllocations() >= base);
depth_ = si.numAllocations() - base;
}
uint32_t operator()() { return depth_; }
}; };
class TryNoteIterIon : public TryNoteIter<IgnoreStackDepthOp> class TryNoteIterIon : public TryNoteIter<IonFrameStackDepthOp>
{ {
public: public:
TryNoteIterIon(JSContext* cx, JSScript* script, jsbytecode* pc) TryNoteIterIon(JSContext* cx, const InlineFrameIterator& frame)
: TryNoteIter(cx, script, pc, IgnoreStackDepthOp()) : TryNoteIter(cx, frame.script(), frame.pc(), IonFrameStackDepthOp(frame))
{ } { }
}; };
@ -415,9 +430,6 @@ static void
HandleExceptionIon(JSContext* cx, const InlineFrameIterator& frame, ResumeFromException* rfe, HandleExceptionIon(JSContext* cx, const InlineFrameIterator& frame, ResumeFromException* rfe,
bool* overrecursed) bool* overrecursed)
{ {
RootedScript script(cx, frame.script());
jsbytecode* pc = frame.pc();
if (cx->compartment()->isDebuggee()) { if (cx->compartment()->isDebuggee()) {
// We need to bail when there is a catchable exception, and we are the // We need to bail when there is a catchable exception, and we are the
// debuggee of a Debugger with a live onExceptionUnwind hook, or if a // debuggee of a Debugger with a live onExceptionUnwind hook, or if a
@ -460,10 +472,11 @@ HandleExceptionIon(JSContext* cx, const InlineFrameIterator& frame, ResumeFromEx
MOZ_ASSERT_IF(rematFrame, !Debugger::inFrameMaps(rematFrame)); MOZ_ASSERT_IF(rematFrame, !Debugger::inFrameMaps(rematFrame));
} }
RootedScript script(cx, frame.script());
if (!script->hasTrynotes()) if (!script->hasTrynotes())
return; return;
for (TryNoteIterIon tni(cx, script, pc); !tni.done(); ++tni) { for (TryNoteIterIon tni(cx, frame); !tni.done(); ++tni) {
JSTryNote* tn = *tni; JSTryNote* tn = *tni;
switch (tn->kind) { switch (tn->kind) {