Diff
Index: branches/safari-606-branch
===================================================================
--- branches/safari-606-branch 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch 2018-12-11 18:12:21 UTC (rev 239075)
Property changes: branches/safari-606-branch
Modified: svn:mergeinfo
-/trunk:53455,235254,235419,235666,236554,236576,236587,238267,238270
\ No newline at end of property
+/trunk:53455,235254,235419,235666,236554,236576,236587,238267,238270,239062
\ No newline at end of property
Modified: branches/safari-606-branch/JSTests/ChangeLog (239074 => 239075)
--- branches/safari-606-branch/JSTests/ChangeLog 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/JSTests/ChangeLog 2018-12-11 18:12:21 UTC (rev 239075)
@@ -1,3 +1,17 @@
+2018-12-10 Mark Lam <[email protected]>
+
+ Cherry-pick r239062. rdar://problem/46603464
+
+ 2018-12-10 Mark Lam <[email protected]>
+
+ PropertyAttribute needs a CustomValue bit.
+ https://bugs.webkit.org/show_bug.cgi?id=191993
+ <rdar://problem/46264467>
+
+ Reviewed by Saam Barati.
+
+ * stress/regress-191993.js: Added.
+
2018-11-26 Alan Coon <[email protected]>
Cherry-pick r238326. rdar://problem/46259215
Copied: branches/safari-606-branch/JSTests/stress/regress-191993.js (from rev 239062, trunk/JSTests/stress/regress-191993.js) (0 => 239075)
--- branches/safari-606-branch/JSTests/stress/regress-191993.js (rev 0)
+++ branches/safari-606-branch/JSTests/stress/regress-191993.js 2018-12-11 18:12:21 UTC (rev 239075)
@@ -0,0 +1,13 @@
+function foo(o) {
+ return o.r.input;
+}
+noInline(foo);
+
+Object.assign({}, RegExp);
+
+for (let i = 0; i < 10000; i++)
+ foo({r: RegExp});
+
+let input = foo({r: RegExp});
+if (typeof input !== "string")
+ throw "FAILED";
Modified: branches/safari-606-branch/Source/_javascript_Core/ChangeLog (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-12-11 18:12:21 UTC (rev 239075)
@@ -1,3 +1,80 @@
+2018-12-10 Mark Lam <[email protected]>
+
+ Cherry-pick r239062. rdar://problem/46603464
+
+ 2018-12-10 Mark Lam <[email protected]>
+
+ PropertyAttribute needs a CustomValue bit.
+ https://bugs.webkit.org/show_bug.cgi?id=191993
+ <rdar://problem/46264467>
+
+ Reviewed by Saam Barati.
+
+ This is because GetByIdStatus needs to distinguish CustomValue properties from
+ other types, and its only means of doing so is via the property's attributes.
+ Previously, there's nothing in the property's attributes that can indicate that
+ the property is a CustomValue.
+
+ We fix this by doing the following:
+
+ 1. Added a PropertyAttribute::CustomValue bit.
+ 2. Added a PropertyAttribute::CustomAccessorOrValue convenience bit mask that is
+ CustomAccessor | CustomValue.
+
+ 3. Since CustomGetterSetter properties are only set via JSObject::putDirectCustomAccessor(),
+ we added a check in JSObject::putDirectCustomAccessor() to see if the attributes
+ bits include PropertyAttribute::CustomAccessor. If not, then the property
+ must be a CustomValue, and we'll add the PropertyAttribute::CustomValue bit
+ to the attributes bits.
+
+ This ensures that the property attributes is sufficient to tell us if the
+ property contains a CustomGetterSetter.
+
+ 4. Updated all checks for PropertyAttribute::CustomAccessor to check for
+ PropertyAttribute::CustomAccessorOrValue instead if their intent is to check
+ for the presence of a CustomGetterSetter as opposed to checking specifically
+ for one that is used as a CustomAccessor.
+
+ This includes all the Structure transition code that needs to capture the
+ attributes change when a CustomValue has been added.
+
+ 5. Filtered out the PropertyAttribute::CustomValue bit in PropertyDescriptor.
+ The fact that we're using a CustomGetterSetter as a CustomValue should remain
+ invisible to the descriptor. This is because the descriptor should describe
+ a CustomValue no differently from a plain value.
+
+ 6. Added some asserts to ensure that property attributes are as expected, and to
+ document some invariants.
+
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeFromLLInt):
+ (JSC::GetByIdStatus::computeForStubInfoWithoutExitSiteFeedback):
+ (JSC::GetByIdStatus::computeFor):
+ * bytecode/InByIdStatus.cpp:
+ (JSC::InByIdStatus::computeForStubInfoWithoutExitSiteFeedback):
+ * bytecode/PropertyCondition.cpp:
+ (JSC::PropertyCondition::isStillValidAssumingImpurePropertyWatchpoint const):
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::computeFor):
+ * runtime/JSFunction.cpp:
+ (JSC::getCalculatedDisplayName):
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::putDirectCustomAccessor):
+ (JSC::JSObject::putDirectNonIndexAccessor):
+ (JSC::JSObject::putDirectIndexSlowOrBeyondVectorLength):
+ * runtime/JSObject.h:
+ (JSC::JSObject::putDirectIndex):
+ (JSC::JSObject::fillCustomGetterPropertySlot):
+ (JSC::JSObject::putDirect):
+ * runtime/JSObjectInlines.h:
+ (JSC::JSObject::putDirectInternal):
+ * runtime/PropertyDescriptor.cpp:
+ (JSC::PropertyDescriptor::setDescriptor):
+ (JSC::PropertyDescriptor::setCustomDescriptor):
+ (JSC::PropertyDescriptor::setAccessorDescriptor):
+ * runtime/PropertySlot.h:
+ (JSC::PropertySlot::setCustomGetterSetter):
+
2018-11-26 Alan Coon <[email protected]>
Cherry-pick r238326. rdar://problem/46259215
Modified: branches/safari-606-branch/Source/_javascript_Core/bytecode/GetByIdStatus.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -83,7 +83,7 @@
PropertyOffset offset = structure->getConcurrently(uid, attributes);
if (!isValidOffset(offset))
return GetByIdStatus(NoInformation, false);
- if (attributes & PropertyAttribute::CustomAccessor)
+ if (attributes & PropertyAttribute::CustomAccessorOrValue)
return GetByIdStatus(NoInformation, false);
return GetByIdStatus(Simple, false, GetByIdVariant(StructureSet(structure), offset));
@@ -190,7 +190,7 @@
variant.m_offset = structure->getConcurrently(uid, attributes);
if (!isValidOffset(variant.m_offset))
return GetByIdStatus(slowPathState, true);
- if (attributes & PropertyAttribute::CustomAccessor)
+ if (attributes & PropertyAttribute::CustomAccessorOrValue)
return GetByIdStatus(slowPathState, true);
variant.m_structureSet.add(structure);
@@ -382,7 +382,7 @@
return GetByIdStatus(TakesSlowPath); // It's probably a prototype lookup. Give up on life for now, even though we could totally be way smarter about it.
if (attributes & PropertyAttribute::Accessor)
return GetByIdStatus(MakesCalls); // We could be smarter here, like strength-reducing this to a Call.
- if (attributes & PropertyAttribute::CustomAccessor)
+ if (attributes & PropertyAttribute::CustomAccessorOrValue)
return GetByIdStatus(TakesSlowPath);
if (!result.appendVariant(GetByIdVariant(structure, offset)))
Modified: branches/safari-606-branch/Source/_javascript_Core/bytecode/InByIdStatus.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/bytecode/InByIdStatus.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/bytecode/InByIdStatus.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -139,7 +139,7 @@
variant.m_offset = structure->getConcurrently(uid, attributes);
if (!isValidOffset(variant.m_offset))
return InByIdStatus(TakesSlowPath);
- if (attributes & PropertyAttribute::CustomAccessor)
+ if (attributes & PropertyAttribute::CustomAccessorOrValue)
return InByIdStatus(TakesSlowPath);
variant.m_structureSet.add(structure);
Modified: branches/safari-606-branch/Source/_javascript_Core/bytecode/PropertyCondition.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/bytecode/PropertyCondition.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/bytecode/PropertyCondition.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -161,7 +161,7 @@
unsigned currentAttributes;
PropertyOffset currentOffset = structure->getConcurrently(uid(), currentAttributes);
if (currentOffset != invalidOffset) {
- if (currentAttributes & (PropertyAttribute::ReadOnly | PropertyAttribute::Accessor | PropertyAttribute::CustomAccessor)) {
+ if (currentAttributes & (PropertyAttribute::ReadOnly | PropertyAttribute::Accessor | PropertyAttribute::CustomAccessorOrValue)) {
if (PropertyConditionInternal::verbose) {
dataLog(
"Invalid because we expected not to have a setter, but we have one at offset ",
Modified: branches/safari-606-branch/Source/_javascript_Core/bytecode/PutByIdStatus.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/bytecode/PutByIdStatus.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/bytecode/PutByIdStatus.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -321,7 +321,7 @@
unsigned attributes;
PropertyOffset offset = structure->getConcurrently(uid, attributes);
if (isValidOffset(offset)) {
- if (attributes & PropertyAttribute::CustomAccessor)
+ if (attributes & PropertyAttribute::CustomAccessorOrValue)
return PutByIdStatus(MakesCalls);
if (attributes & (PropertyAttribute::Accessor | PropertyAttribute::ReadOnly))
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/JSFunction.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/JSFunction.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/JSFunction.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -635,7 +635,7 @@
unsigned attributes;
// This function may be called when the mutator isn't running and we are lazily generating a stack trace.
PropertyOffset offset = structure->getConcurrently(vm.propertyNames->displayName.impl(), attributes);
- if (offset != invalidOffset && !(attributes & (PropertyAttribute::Accessor | PropertyAttribute::CustomAccessor))) {
+ if (offset != invalidOffset && !(attributes & (PropertyAttribute::Accessor | PropertyAttribute::CustomAccessorOrValue))) {
JSValue displayName = object->getDirect(offset);
if (displayName && displayName.isString())
return asString(displayName)->tryGetValue();
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -1828,9 +1828,15 @@
return putDirectNonIndexAccessor(exec->vm(), propertyName, accessor, attributes);
}
+// FIXME: Introduce a JSObject::putDirectCustomValue() method instead of using
+// JSObject::putDirectCustomAccessor() to put CustomValues.
+// https://bugs.webkit.org/show_bug.cgi?id=192576
bool JSObject::putDirectCustomAccessor(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes)
{
ASSERT(!parseIndex(propertyName));
+ ASSERT(value.isCustomGetterSetter());
+ if (!(attributes & PropertyAttribute::CustomAccessor))
+ attributes |= PropertyAttribute::CustomValue;
PutPropertySlot slot(this);
bool result = putDirectInternal<PutModeDefineOwnProperty>(vm, propertyName, value, attributes, slot);
@@ -1846,6 +1852,7 @@
bool JSObject::putDirectNonIndexAccessor(VM& vm, PropertyName propertyName, GetterSetter* accessor, unsigned attributes)
{
+ ASSERT(attributes & PropertyAttribute::Accessor);
PutPropertySlot slot(this);
bool result = putDirectInternal<PutModeDefineOwnProperty>(vm, propertyName, accessor, attributes, slot);
@@ -2967,7 +2974,8 @@
bool JSObject::putDirectIndexSlowOrBeyondVectorLength(ExecState* exec, unsigned i, JSValue value, unsigned attributes, PutDirectIndexMode mode)
{
VM& vm = exec->vm();
-
+ ASSERT(!value.isCustomGetterSetter());
+
if (!canDoFastPutDirectIndex(vm, this)) {
PropertyDescriptor descriptor;
descriptor.setDescriptor(value, attributes);
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.h (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.h 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/JSObject.h 2018-12-11 18:12:21 UTC (rev 239075)
@@ -217,6 +217,7 @@
// otherwise, it creates a property with the provided attributes. Semantically, this is performing defineOwnProperty.
bool putDirectIndex(ExecState* exec, unsigned propertyName, JSValue value, unsigned attributes, PutDirectIndexMode mode)
{
+ ASSERT(!value.isCustomGetterSetter());
auto canSetIndexQuicklyForPutDirect = [&] () -> bool {
switch (indexingMode()) {
case ALL_BLANK_INDEXING_TYPES:
@@ -1375,6 +1376,7 @@
ALWAYS_INLINE void JSObject::fillCustomGetterPropertySlot(VM& vm, PropertySlot& slot, CustomGetterSetter* customGetterSetter, unsigned attributes, Structure* structure)
{
+ ASSERT(attributes & PropertyAttribute::CustomAccessorOrValue);
if (customGetterSetter->inherits<DOMAttributeGetterSetter>(vm)) {
auto* domAttribute = jsCast<DOMAttributeGetterSetter*>(customGetterSetter);
if (structure->isUncacheableDictionary())
@@ -1500,7 +1502,7 @@
inline bool JSObject::putDirect(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes)
{
ASSERT(!value.isGetterSetter() && !(attributes & PropertyAttribute::Accessor));
- ASSERT(!value.isCustomGetterSetter());
+ ASSERT(!value.isCustomGetterSetter() && !(attributes & PropertyAttribute::CustomAccessorOrValue));
PutPropertySlot slot(this);
return putDirectInternal<PutModeDefineOwnProperty>(vm, propertyName, value, attributes, slot);
}
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/JSObjectInlines.h (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/JSObjectInlines.h 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/JSObjectInlines.h 2018-12-11 18:12:21 UTC (rev 239075)
@@ -279,6 +279,7 @@
{
ASSERT(value);
ASSERT(value.isGetterSetter() == !!(attributes & PropertyAttribute::Accessor));
+ ASSERT(value.isCustomGetterSetter() == !!(attributes & PropertyAttribute::CustomAccessorOrValue));
ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
ASSERT(!parseIndex(propertyName));
@@ -297,7 +298,7 @@
putDirect(vm, offset, value);
structure->didReplaceProperty(offset);
- if ((attributes & PropertyAttribute::Accessor) != (currentAttributes & PropertyAttribute::Accessor) || (attributes & PropertyAttribute::CustomAccessor) != (currentAttributes & PropertyAttribute::CustomAccessor)) {
+ if ((attributes & PropertyAttribute::Accessor) != (currentAttributes & PropertyAttribute::Accessor) || (attributes & PropertyAttribute::CustomAccessorOrValue) != (currentAttributes & PropertyAttribute::CustomAccessorOrValue)) {
ASSERT(!(attributes & PropertyAttribute::ReadOnly));
setStructure(vm, Structure::attributeChangeTransition(vm, structure, propertyName, attributes));
} else
@@ -360,7 +361,7 @@
putDirect(vm, offset, value);
- if ((attributes & PropertyAttribute::Accessor) != (currentAttributes & PropertyAttribute::Accessor) || (attributes & PropertyAttribute::CustomAccessor) != (currentAttributes & PropertyAttribute::CustomAccessor)) {
+ if ((attributes & PropertyAttribute::Accessor) != (currentAttributes & PropertyAttribute::Accessor) || (attributes & PropertyAttribute::CustomAccessorOrValue) != (currentAttributes & PropertyAttribute::CustomAccessorOrValue)) {
ASSERT(!(attributes & PropertyAttribute::ReadOnly));
setStructure(vm, Structure::attributeChangeTransition(vm, structure, propertyName, attributes));
} else
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/PropertyDescriptor.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/PropertyDescriptor.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/PropertyDescriptor.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -109,7 +109,13 @@
{
ASSERT(value);
- m_attributes = attributes;
+ // We need to mask off the PropertyAttribute::CustomValue bit because
+ // PropertyDescriptor::attributesEqual() does an equivalent test on
+ // m_attributes, and a property that has a CustomValue should be indistinguishable
+ // from a property that has a normal value as far as JS code is concerned.
+ // PropertyAttribute does not need knowledge of the underlying implementation
+ // actually being a CustomValue. So, we'll just mask it off up front here.
+ m_attributes = attributes & ~PropertyAttribute::CustomValue;
if (value.isGetterSetter()) {
m_attributes &= ~PropertyAttribute::ReadOnly; // FIXME: we should be able to ASSERT this!
@@ -125,6 +131,7 @@
void PropertyDescriptor::setCustomDescriptor(unsigned attributes)
{
+ ASSERT(!(attributes & PropertyAttribute::CustomValue));
m_attributes = attributes | PropertyAttribute::Accessor | PropertyAttribute::CustomAccessor;
m_attributes &= ~PropertyAttribute::ReadOnly;
m_seenAttributes = EnumerablePresent | ConfigurablePresent;
@@ -136,6 +143,7 @@
void PropertyDescriptor::setAccessorDescriptor(GetterSetter* accessor, unsigned attributes)
{
ASSERT(attributes & PropertyAttribute::Accessor);
+ ASSERT(!(attributes & PropertyAttribute::CustomValue));
attributes &= ~PropertyAttribute::ReadOnly; // FIXME: we should be able to ASSERT this!
m_attributes = attributes;
Modified: branches/safari-606-branch/Source/_javascript_Core/runtime/PropertySlot.h (239074 => 239075)
--- branches/safari-606-branch/Source/_javascript_Core/runtime/PropertySlot.h 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/_javascript_Core/runtime/PropertySlot.h 2018-12-11 18:12:21 UTC (rev 239075)
@@ -43,6 +43,8 @@
DontDelete = 1 << 3, // property can't be deleted
Accessor = 1 << 4, // property is a getter/setter
CustomAccessor = 1 << 5,
+ CustomValue = 1 << 6,
+ CustomAccessorOrValue = CustomAccessor | CustomValue,
// Things that are used by static hashtables are not in the attributes byte in PropertyMapEntry.
Function = 1 << 8, // property is a function - only used by static hashtables
@@ -299,6 +301,7 @@
void setCustomGetterSetter(JSObject* slotBase, unsigned attributes, CustomGetterSetter* getterSetter)
{
ASSERT(attributes == attributesForStructure(attributes));
+ ASSERT(attributes & PropertyAttribute::CustomAccessor);
disableCaching();
Index: branches/safari-606-branch/Source/WebCore
===================================================================
--- branches/safari-606-branch/Source/WebCore 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/WebCore 2018-12-11 18:12:21 UTC (rev 239075)
Property changes: branches/safari-606-branch/Source/WebCore
Modified: svn:mergeinfo
/branches/ftlopt/Source/WebCore:170680
-/trunk/Source/WebCore:235254
+/trunk/Source/WebCore:235254,239062
/trunk/WebCore:53455
\ No newline at end of property
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (239074 => 239075)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-12-11 18:12:21 UTC (rev 239075)
@@ -1,3 +1,27 @@
+2018-12-10 Mark Lam <[email protected]>
+
+ Cherry-pick r239062. rdar://problem/46603464
+
+ 2018-12-10 Mark Lam <[email protected]>
+
+ PropertyAttribute needs a CustomValue bit.
+ https://bugs.webkit.org/show_bug.cgi?id=191993
+ <rdar://problem/46264467>
+
+ Reviewed by Saam Barati.
+
+ This patch revealed a bug in the CodeGenerator where a constructor property is
+ set with a ReadOnly attribute. This conflicts with the WebIDL link (see clause
+ 12 in https://heycam.github.io/webidl/#interface-prototype-object) which states
+ that it should be [Writable]. The ReadOnly attribute is now removed.
+
+ On the WebCore side, this change is covered by existing tests.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
+ (WebCore::jsTestCustomConstructorWithNoInterfaceObjectConstructor):
+
2018-12-05 Alan Coon <[email protected]>
Apply patch. rdar://problem/46085280
Modified: branches/safari-606-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (239074 => 239075)
--- branches/safari-606-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-12-11 18:12:21 UTC (rev 239075)
@@ -4436,7 +4436,7 @@
} else {
push(@implContent, " JSValue constructor = ${className}Constructor::create(state->vm(), ${className}Constructor::createStructure(state->vm(), *prototype->globalObject(), prototype->globalObject()->objectPrototype()), *jsCast<JSDOMGlobalObject*>(prototype->globalObject()));\n");
push(@implContent, " // Shadowing constructor property to ensure reusing the same constructor object\n");
- push(@implContent, " prototype->putDirect(vm, vm.propertyNames->constructor, constructor, JSC::PropertyAttribute::DontEnum | JSC::PropertyAttribute::ReadOnly);\n");
+ push(@implContent, " prototype->putDirect(vm, vm.propertyNames->constructor, constructor, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));\n");
push(@implContent, " return JSValue::encode(constructor);\n");
}
push(@implContent, "}\n\n");
Modified: branches/safari-606-branch/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp (239074 => 239075)
--- branches/safari-606-branch/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp 2018-12-11 17:39:16 UTC (rev 239074)
+++ branches/safari-606-branch/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp 2018-12-11 18:12:21 UTC (rev 239075)
@@ -141,7 +141,7 @@
return throwVMTypeError(state, throwScope);
JSValue constructor = JSTestCustomConstructorWithNoInterfaceObjectConstructor::create(state->vm(), JSTestCustomConstructorWithNoInterfaceObjectConstructor::createStructure(state->vm(), *prototype->globalObject(), prototype->globalObject()->objectPrototype()), *jsCast<JSDOMGlobalObject*>(prototype->globalObject()));
// Shadowing constructor property to ensure reusing the same constructor object
- prototype->putDirect(vm, vm.propertyNames->constructor, constructor, JSC::PropertyAttribute::DontEnum | JSC::PropertyAttribute::ReadOnly);
+ prototype->putDirect(vm, vm.propertyNames->constructor, constructor, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum));
return JSValue::encode(constructor);
}
