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 1134198 - Rename assertNotInFrameMaps to inFrameMaps. (r=tromey)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-04-02 17:28:02 -07:00
parent 5c1632dab9
commit ab1939a1bf
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,10 +436,7 @@ HandleExceptionIon(JSContext* cx, const InlineFrameIterator& frame, ResumeFromEx
Debugger::handleUnrecoverableIonBailoutError(cx, rematFrame);
}
#ifdef DEBUG
if (rematFrame)
Debugger::assertNotInFrameMaps(rematFrame);
#endif
MOZ_ASSERT_IF(rematFrame, !Debugger::inFrameMaps(rematFrame));
}
if (!script->hasTrynotes())

2
js/src/jit/RematerializedFrame.cpp
View File

@ -98,7 +98,7 @@ RematerializedFrame::FreeInVector(Vector<RematerializedFrame*>& frames)
{
for (size_t i = 0; i < frames.length(); i++) {
RematerializedFrame* f = frames[i];
Debugger::assertNotInFrameMaps(f);
MOZ_ASSERT(!Debugger::inFrameMaps(f));
f->RematerializedFrame::~RematerializedFrame();
js_free(f);
}

2
js/src/vm/Debugger-inl.h
View File

@ -22,7 +22,7 @@ js::Debugger::onLeaveFrame(JSContext* cx, AbstractFramePtr frame, bool ok)
MOZ_ASSERT_IF(evalTraps, frame.isDebuggee());
if (frame.isDebuggee())
ok = slowPathOnLeaveFrame(cx, frame, ok);
assertNotInFrameMaps(frame);
MOZ_ASSERT(!inFrameMaps(frame));
return ok;
}

8
js/src/vm/Debugger.cpp
View File

@ -4998,13 +4998,11 @@ Debugger::replaceFrameGuts(JSContext* cx, AbstractFramePtr from, AbstractFramePt
return true;
}
/* static */ void
Debugger::assertNotInFrameMaps(AbstractFramePtr frame)
/* static */ bool
Debugger::inFrameMaps(AbstractFramePtr frame)
{
#ifdef DEBUG
FrameRange r(frame);
MOZ_ASSERT(r.empty());
#endif
return !r.empty();
}
/* static */ void

2
js/src/vm/Debugger.h
View File

@ -675,7 +675,7 @@ class Debugger : private mozilla::LinkedListElement<Debugger>
static void handleUnrecoverableIonBailoutError(JSContext* cx, jit::RematerializedFrame* frame);
static void propagateForcedReturn(JSContext* cx, AbstractFramePtr frame, HandleValue rval);
static bool hasLiveHook(GlobalObject* global, Hook which);
static void assertNotInFrameMaps(AbstractFramePtr frame);
static bool inFrameMaps(AbstractFramePtr frame);
/************************************* Functions for use by Debugger.cpp. */