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 942631 part 7. Move INSTANCE_RESERVED_SLOTS into the C++, so it's closer to the things it depends on. r=peterv

Browse Source
This commit is contained in:
Boris Zbarsky 2013-12-04 08:02:19 -05:00
parent 7a906fe78a
commit ff32aca614
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dom/bindings/Codegen.py
View File

@ -27,7 +27,7 @@ ENUM_ENTRY_VARIABLE_NAME = 'strings'
INSTANCE_RESERVED_SLOTS = 3
def memberReservedSlot(member):
return INSTANCE_RESERVED_SLOTS + member.slotIndex
return "(DOM_INSTANCE_RESERVED_SLOTS + %d)" % member.slotIndex
def replaceFileIfChanged(filename, newContents):
"""
@ -2442,7 +2442,7 @@ class CGUpdateMemberSlotsMethod(CGAbstractStaticMethod):
m.isAttr() and m.getExtendedAttribute("StoreInSlot"))
storeSlots = (
CGGeneric(
'static_assert(%d < js::shadow::Object::MAX_FIXED_SLOTS,\n'
'static_assert(%s < js::shadow::Object::MAX_FIXED_SLOTS,\n'
' "Not enough fixed slots to fit \'%s.%s\'");\n'
"if (!get_%s(aCx, aWrapper, aObject, args)) {\n"
" return false;\n"
@ -2481,13 +2481,13 @@ class CGClearCachedValueMethod(CGAbstractMethod):
declObj = "JS::Rooted<JSObject*> obj(aCx);"
noopRetval = " true"
saveMember = (
"JS::Rooted<JS::Value> oldValue(aCx, js::GetReservedSlot(obj, %d));\n" %
"JS::Rooted<JS::Value> oldValue(aCx, js::GetReservedSlot(obj, %s));\n" %
slotIndex)
regetMember = ("\n"
"JS::Rooted<JS::Value> temp(aCx);\n"
"JSJitGetterCallArgs args(&temp);\n"
"if (!get_%s(aCx, obj, aObject, args)) {\n"
" js::SetReservedSlot(obj, %d, oldValue);\n"
" js::SetReservedSlot(obj, %s, oldValue);\n"
" nsJSUtils::ReportPendingException(aCx);\n"
" return false;\n"
"}\n"
@ -2505,7 +2505,7 @@ class CGClearCachedValueMethod(CGAbstractMethod):
" return%s;\n"
"}\n"
"%s"
"js::SetReservedSlot(obj, %d, JS::UndefinedValue());"
"js::SetReservedSlot(obj, %s, JS::UndefinedValue());"
"%s"
% (declObj, noopRetval, saveMember, slotIndex, regetMember)
)).define()
@ -5101,7 +5101,7 @@ if (!${obj}) {
" if (!%s(cx, &tempVal)) {\n"
" return false;\n"
" }\n"
" js::SetReservedSlot(reflector, %d, tempVal);\n"
" js::SetReservedSlot(reflector, %s, tempVal);\n"
"%s"
"}\n"
"return true;" %
@ -5965,7 +5965,7 @@ class CGSpecializedGetter(CGAbstractStaticMethod):
" reflector = IsDOMObject(obj) ? obj : js::UncheckedUnwrap(obj, /* stopAtOuter = */ false);\n"
" {\n"
" // Scope for cachedVal\n"
" JS::Value cachedVal = js::GetReservedSlot(reflector, %d);\n"
" JS::Value cachedVal = js::GetReservedSlot(reflector, %s);\n"
" if (!cachedVal.isUndefined()) {\n"
" args.rval().set(cachedVal);\n"
" // The cached value is in the compartment of reflector,\n"
@ -6186,7 +6186,7 @@ class CGMemberJITInfo(CGThing):
" %s, /* isMovable. Not relevant for setters. */\n"
" JSJitInfo::%s, /* aliasSet. Not relevant for setters. */\n"
" %s, /* hasSlot. Only relevant for getters. */\n"
" %d, /* Reserved slot index, if we're stored in a slot, else 0. */\n"
" %s, /* Reserved slot index, if we're stored in a slot, else 0. */\n"
" %s, /* returnType. Not relevant for setters. */\n"
" %s, /* argTypes. Only relevant for methods */\n"
" nullptr /* parallelNative */\n"
@ -6216,11 +6216,10 @@ class CGMemberJITInfo(CGThing):
isInSlot = self.member.getExtendedAttribute("StoreInSlot")
if isInSlot:
slotIndex = memberReservedSlot(self.member);
if slotIndex >= 16 : # JS engine currently allows 16 fixed slots
raise TypeError("Make sure we can actually have this many "
"fixed slots, please!")
# We'll statically assert that this is not too big in
# CGUpdateMemberSlotsMethod
else:
slotIndex = 0
slotIndex = "0"
result = self.defineJitInfo(getterinfo, getter, "Getter",
getterinfal, movable, aliasSet,
@ -6236,7 +6235,7 @@ class CGMemberJITInfo(CGThing):
# Setters are always fallible, since they have to do a typed unwrap.
result += self.defineJitInfo(setterinfo, setter, "Setter",
False, False, "AliasEverything",
False, 0,
False, "0",
[BuiltinTypes[IDLBuiltinType.Types.void]],
None)
return result
@ -6277,7 +6276,7 @@ class CGMemberJITInfo(CGThing):
else:
aliasSet = "AliasEverything"
result = self.defineJitInfo(methodinfo, method, "Method",
methodInfal, False, aliasSet, False, 0,
methodInfal, False, aliasSet, False, "0",
[s[0] for s in sigs], args)
return result
raise TypeError("Illegal member type to CGPropertyJITInfo")

4
dom/bindings/JSSlots.h
View File

@ -25,6 +25,10 @@
// to new bindings.
#define DOM_OBJECT_SLOT_SOW 2
// The total number of slots non-proxy DOM objects use by default.
// Specific objects may have more for storing cached values.
#define DOM_INSTANCE_RESERVED_SLOTS 3
// NOTE: This is baked into the Ion JIT as 0 in codegen for LGetDOMProperty and
// LSetDOMProperty. Those constants need to be changed accordingly if this value
// changes.