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 770889 - Simplify AutoDetectInvalidation a bit. r=dvander

Browse Source
This commit is contained in:
Jan de Mooij 2012-07-05 19:16:11 +02:00
parent 677220e136
commit bb4870e626
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/ion/IonCaches.cpp
View File

@ -291,8 +291,7 @@ IsCacheableGetProp(JSObject *obj, JSObject *holder, const Shape *shape)
bool
js::ion::GetPropertyCache(JSContext *cx, size_t cacheIndex, HandleObject obj, Value *vp)
{
JSScript *topScript = GetTopIonJSScript(cx);
IonScript *ion = topScript->ionScript();
IonScript *ion = GetTopIonJSScript(cx)->ionScript();
IonCacheGetProperty &cache = ion->getCache(cacheIndex).toGetProperty();
RootedPropertyName name(cx, cache.name());
@ -302,7 +301,7 @@ js::ion::GetPropertyCache(JSContext *cx, size_t cacheIndex, HandleObject obj, Va
cache.getScriptedLocation(&script, &pc);
// Override the return value if we are invalidated (bug 728188).
AutoDetectInvalidation adi(cx, vp, topScript);
AutoDetectInvalidation adi(cx, vp, ion);
// For now, just stop generating new stubs once we hit the stub count
// limit. Once we can make calls from within generated stubs, a new call
@ -763,13 +762,12 @@ IonCacheGetElement::attachDenseArray(JSContext *cx, JSObject *obj, const Value &
bool
js::ion::GetElementCache(JSContext *cx, size_t cacheIndex, JSObject *obj, const Value &idval, Value *res)
{
JSScript *script = GetTopIonJSScript(cx);
IonScript *ion = script->ionScript();
IonScript *ion = GetTopIonJSScript(cx)->ionScript();
IonCacheGetElement &cache = ion->getCache(cacheIndex).toGetElement();
// Override the return value if we are invalidated (bug 728188).
AutoDetectInvalidation adi(cx, res, script);
AutoDetectInvalidation adi(cx, res, ion);
RootedId id(cx);
if (!FetchElementId(cx, obj, idval, id.address(), res))
@ -793,14 +791,14 @@ js::ion::GetElementCache(JSContext *cx, size_t cacheIndex, JSObject *obj, const
}
}
JSScript *script_;
JSScript *script;
jsbytecode *pc;
cache.getScriptedLocation(&script_, &pc);
cache.getScriptedLocation(&script, &pc);
if (!GetElementOperation(cx, JSOp(*pc), ObjectValue(*obj), idval, res))
return false;
types::TypeScript::Monitor(cx, script_, pc, *res);
types::TypeScript::Monitor(cx, script, pc, *res);
return true;
}
@ -1123,8 +1121,7 @@ IsCacheableName(JSContext *cx, HandleObject scopeChain, HandleObject obj, Handle
bool
js::ion::GetNameCache(JSContext *cx, size_t cacheIndex, HandleObject scopeChain, Value *vp)
{
JSScript *topScript = GetTopIonJSScript(cx);
IonScript *ion = topScript->ionScript();
IonScript *ion = GetTopIonJSScript(cx)->ionScript();
IonCacheName &cache = ion->getCache(cacheIndex).toName();
RootedPropertyName name(cx, cache.name());

10
js/src/ion/VMFunctions.h
View File

@ -393,20 +393,18 @@ template <class R, class A1, class A2, class A3, class A4, class A5>
class AutoDetectInvalidation
{
JSContext *cx_;
JSScript *script_;
IonScript *ion_;
IonScript *ionScript_;
Value *rval_;
public:
AutoDetectInvalidation(JSContext *cx, Value *rval, JSScript *script = NULL)
AutoDetectInvalidation(JSContext *cx, Value *rval, IonScript *ionScript = NULL)
: cx_(cx),
script_(script ? script : GetTopIonJSScript(cx)),
ion_(script_->ionScript()),
ionScript_(ionScript ? ionScript : GetTopIonJSScript(cx)->ion),
rval_(rval)
{ }
~AutoDetectInvalidation() {
if (script_->ion != ion_)
if (ionScript_->invalidated())
cx_->runtime->setIonReturnOverride(*rval_);
}
};