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

[JAEGER] Fixed nits from branding fix.

Browse Source
This commit is contained in:
David Anderson 2010-06-22 15:09:07 -07:00
parent f4a612c01c
commit 408c243f13
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/methodjit/PolyIC.cpp
View File

@ -307,7 +307,7 @@ class SetPropCompiler : public PICStubCompiler
// to guard that we're not overwriting a function-valued property.
Jump rebrand;
JSScope *scope = obj->scope();
if (scope->branded() || scope->hasMethodBarrier()) {
if (scope->brandedOrHasMethodBarrier()) {
masm.loadTypeTag(address, pic.shapeReg);
rebrand = masm.branch32(Assembler::Equal, pic.shapeReg, Imm32(JSVAL_MASK32_FUNOBJ));
}
@ -382,21 +382,20 @@ class SetPropCompiler : public PICStubCompiler
if (holder != obj)
return disable("property not on object");
JSScope *scope = obj->scope();
JSScopeProperty *sprop = (JSScopeProperty *)prop;
if (!sprop->writable())
return disable("readonly");
if (obj->scope()->sealed() && !sprop->hasSlot())
if (scope->sealed() && !sprop->hasSlot())
return disable("what does this even mean");
if (!sprop->hasDefaultSetter())
return disable("setter");
if (!SPROP_HAS_VALID_SLOT(sprop, obj->scope()))
if (!SPROP_HAS_VALID_SLOT(sprop, scope))
return disable("invalid slot");
bool needsBarrier = obj->scope()->branded() || obj->scope()->hasMethodBarrier();
JS_ASSERT(obj == holder);
if (!pic.inlinePathPatched && !needsBarrier)
if (!pic.inlinePathPatched && !scope->brandedOrHasMethodBarrier())
return patchInline(sprop);
else
return generateStub(sprop);