Attachment 343375 Details for Bug 186943 – proposed patch.

[patch] proposed patch.

bug-186943.patch (text/plain), 4.21 KB, created by Mark Lam on 2018-06-22 15:31:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Lam

Created: 2018-06-22 15:31:04 PDT

Size: 4.21 KB

patch

obsolete

>Index: JSTests/ChangeLog
>===================================================================
>--- JSTests/ChangeLog	(revision 233101)
>+++ JSTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-06-22  Mark Lam  <mark.lam@apple.com>
>+
>+        PropertyCondition::isValidValueForAttributes() should also consider deleted values.
>+        https://bugs.webkit.org/show_bug.cgi?id=186943
>+        <rdar://problem/41370337>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * stress/regress-186943.js: Added.
>+
> 2018-06-20  Keith Miller  <keith_miller@apple.com>
> 
>         flattenDictionaryStruture needs to zero inline storage.
>Index: JSTests/stress/regress-186943.js
>===================================================================
>--- JSTests/stress/regress-186943.js	(nonexistent)
>+++ JSTests/stress/regress-186943.js	(working copy)
>@@ -0,0 +1,5 @@
>+// This test should not crash.
>+x = Reflect;
>+delete this.Reflect;
>+
>+for (var i = 0; i < 10000; ++i) { }
>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 233083)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-06-22  Mark Lam  <mark.lam@apple.com>
>+
>+        PropertyCondition::isValidValueForAttributes() should also consider deleted values.
>+        https://bugs.webkit.org/show_bug.cgi?id=186943
>+        <rdar://problem/41370337>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PropertyCondition::isValidValueForAttributes() should check if the passed in value
>+        is a deleted one before it does a jsDynamicCast on it.
>+
>+        * bytecode/PropertyCondition.cpp:
>+        (JSC::PropertyCondition::isValidValueForAttributes):
>+        * runtime/JSCJSValue.h:
>+        * runtime/JSCJSValueInlines.h:
>+        (JSC::JSValue::isCleared const):
>+
> 2018-06-20  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] Use the isDirectory: variants of NSURL methods more to eliminate unnecessary file system activity
>Index: Source/JavaScriptCore/bytecode/PropertyCondition.cpp
>===================================================================
>--- Source/JavaScriptCore/bytecode/PropertyCondition.cpp	(revision 233083)
>+++ Source/JavaScriptCore/bytecode/PropertyCondition.cpp	(working copy)
>@@ -377,6 +377,8 @@ void PropertyCondition::validateReferenc
> 
> bool PropertyCondition::isValidValueForAttributes(VM& vm, JSValue value, unsigned attributes)
> {
>+    if (value.isCleared())
>+        return false;
>     bool attributesClaimAccessor = !!(attributes & PropertyAttribute::Accessor);
>     bool valueClaimsAccessor = !!jsDynamicCast<GetterSetter*>(vm, value);
>     return attributesClaimAccessor == valueClaimsAccessor;
>Index: Source/JavaScriptCore/runtime/JSCJSValue.h
>===================================================================
>--- Source/JavaScriptCore/runtime/JSCJSValue.h	(revision 233083)
>+++ Source/JavaScriptCore/runtime/JSCJSValue.h	(working copy)
>@@ -217,6 +217,7 @@ public:
>     int32_t asInt32ForArithmetic() const; // Boolean becomes an int, but otherwise like asInt32().
> 
>     // Querying the type.
>+    bool isCleared() const;
>     bool isEmpty() const;
>     bool isFunction(VM&) const;
>     bool isCallable(VM&, CallType&, CallData&) const;
>Index: Source/JavaScriptCore/runtime/JSCJSValueInlines.h
>===================================================================
>--- Source/JavaScriptCore/runtime/JSCJSValueInlines.h	(revision 233083)
>+++ Source/JavaScriptCore/runtime/JSCJSValueInlines.h	(working copy)
>@@ -344,13 +344,11 @@ inline JSValue::JSValue(int i)
>     u.asBits.payload = i;
> }
> 
>-#if USE(JSVALUE32_64)
> inline JSValue::JSValue(int32_t tag, int32_t payload)
> {
>     u.asBits.tag = tag;
>     u.asBits.payload = payload;
> }
>-#endif
> 
> inline bool JSValue::isNumber() const
> {
>@@ -529,6 +527,15 @@ ALWAYS_INLINE JSCell* JSValue::asCell() 
> 
> #endif // USE(JSVALUE64)
> 
>+// This is needed because we clear unused properties with a nullptr value.
>+// On 64-bit, this is ValueEmpty. On 32-bit, this is a double value.
>+// This method is provided so that we can just do a bitwise check of the
>+// cleared value that works for both 64-bit and 32-bit.
>+inline bool JSValue::isCleared() const
>+{
>+    return !u.asInt64;
>+}
>+
> inline int64_t tryConvertToInt52(double number)
> {
>     if (number != number)

Actions: View | Formatted Diff | Diff

Attachments on bug 186943: 343372 | 343374 | 343375 | 343381