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 791122 - IonMonkey, fix bogus DOM exit frame assertion. r=efaust

Browse Source
This commit is contained in:
Nicolas B. Pierron 2012-09-17 10:21:22 -07:00
parent f0e38d4eef
commit 3d1b625fd2
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/ion/IonFrames.cpp
View File

@ -122,10 +122,7 @@ IonFrameIterator::isDOMExit() const
{
if (type_ != IonFrame_Exit)
return false;
IonCode *code = exitFrame()->footer()->ionCode();
return code == ION_FRAME_DOMGETTER ||
code == ION_FRAME_DOMSETTER ||
code == ION_FRAME_DOMMETHOD;
return exitFrame()->isDomExit();
}
bool

20
js/src/ion/arm/IonFrames-arm.h
View File

@ -185,14 +185,28 @@ class IonExitFrameLayout : public IonCommonFrameLayout
JS_ASSERT(footer()->ionCode() != NULL);
return top();
}
inline bool isWrapperExit() {
return footer()->function() != NULL;
}
inline bool isNativeExit() {
return footer()->ionCode() == NULL;
}
inline bool isDomExit() {
IonCode *code = footer()->ionCode();
return
code == ION_FRAME_DOMGETTER ||
code == ION_FRAME_DOMSETTER ||
code == ION_FRAME_DOMMETHOD;
}
inline IonNativeExitFrameLayout *nativeExit() {
// see CodeGenerator::visitCallNative
JS_ASSERT(footer()->ionCode() == NULL);
JS_ASSERT(isNativeExit());
return reinterpret_cast<IonNativeExitFrameLayout *>(footer());
}
inline IonDOMExitFrameLayout *DOMExit() {
JS_ASSERT(footer()->ionCode() == ION_FRAME_DOMGETTER ||
footer()->ionCode() == ION_FRAME_DOMSETTER);
JS_ASSERT(isDomExit());
return reinterpret_cast<IonDOMExitFrameLayout *>(footer());
}
};

20
js/src/ion/shared/IonFrames-x86-shared.h
View File

@ -169,14 +169,28 @@ class IonExitFrameLayout : public IonCommonFrameLayout
JS_ASSERT(footer()->ionCode() != NULL);
return top();
}
inline bool isWrapperExit() {
return footer()->function() != NULL;
}
inline bool isNativeExit() {
return footer()->ionCode() == NULL;
}
inline bool isDomExit() {
IonCode *code = footer()->ionCode();
return
code == ION_FRAME_DOMGETTER ||
code == ION_FRAME_DOMSETTER ||
code == ION_FRAME_DOMMETHOD;
}
inline IonNativeExitFrameLayout *nativeExit() {
// see CodeGenerator::visitCallNative
JS_ASSERT(footer()->ionCode() == NULL);
JS_ASSERT(isNativeExit());
return reinterpret_cast<IonNativeExitFrameLayout *>(footer());
}
inline IonDOMExitFrameLayout *DOMExit() {
JS_ASSERT(footer()->ionCode() == ION_FRAME_DOMGETTER ||
footer()->ionCode() == ION_FRAME_DOMSETTER);
JS_ASSERT(isDomExit());
return reinterpret_cast<IonDOMExitFrameLayout *>(footer());
}
};