зеркало из https://github.com/mozilla/gecko-dev.git
Bug 855264 part 3 - Fix GCC warnings. r=djvj
This commit is contained in:
Родитель
16e5bb1bbd
Коммит
2d77e7d527
|
@ -4302,7 +4302,7 @@ TryAttachScopeNameStub(JSContext *cx, HandleScript script, ICGetName_Fallback *s
|
|||
RootedId id(cx, NameToId(name));
|
||||
RootedObject scopeChain(cx, initialScopeChain);
|
||||
|
||||
Shape *shape;
|
||||
Shape *shape = NULL;
|
||||
while (scopeChain) {
|
||||
if (!shapes.append(scopeChain->lastProperty()))
|
||||
return false;
|
||||
|
|
|
@ -115,19 +115,9 @@ class IonFrameIterator
|
|||
}
|
||||
|
||||
// Returns true iff this exit frame was created using EnsureExitFrame.
|
||||
bool isFakeExitFrame() const {
|
||||
bool res = (prevType() == IonFrame_Unwound_Rectifier ||
|
||||
prevType() == IonFrame_Unwound_OptimizedJS ||
|
||||
prevType() == IonFrame_Unwound_BaselineStub);
|
||||
JS_ASSERT_IF(res, type() == IonFrame_Exit || type() == IonFrame_BaselineJS);
|
||||
return res;
|
||||
}
|
||||
inline bool isFakeExitFrame() const;
|
||||
|
||||
IonExitFrameLayout *exitFrame() const {
|
||||
JS_ASSERT(type() == IonFrame_Exit);
|
||||
JS_ASSERT(!isFakeExitFrame());
|
||||
return (IonExitFrameLayout *) fp();
|
||||
}
|
||||
inline IonExitFrameLayout *exitFrame() const;
|
||||
|
||||
// Returns whether the JS frame has been invalidated and, if so,
|
||||
// places the invalidated Ion script in |ionScript|.
|
||||
|
|
|
@ -76,6 +76,24 @@ IonFrameIterator::prevType() const
|
|||
return current->prevType();
|
||||
}
|
||||
|
||||
inline bool
|
||||
IonFrameIterator::isFakeExitFrame() const
|
||||
{
|
||||
bool res = (prevType() == IonFrame_Unwound_Rectifier ||
|
||||
prevType() == IonFrame_Unwound_OptimizedJS ||
|
||||
prevType() == IonFrame_Unwound_BaselineStub);
|
||||
JS_ASSERT_IF(res, type() == IonFrame_Exit || type() == IonFrame_BaselineJS);
|
||||
return res;
|
||||
}
|
||||
|
||||
inline IonExitFrameLayout *
|
||||
IonFrameIterator::exitFrame() const
|
||||
{
|
||||
JS_ASSERT(type() == IonFrame_Exit);
|
||||
JS_ASSERT(!isFakeExitFrame());
|
||||
return (IonExitFrameLayout *) fp();
|
||||
}
|
||||
|
||||
size_t
|
||||
IonFrameIterator::frameSize() const
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче