Attachment 348408 Details for Bug 189085 – ROLLOUT of r235436

[patch] ROLLOUT of r235436

bug-189085-20180829131034.patch (text/plain), 12.60 KB, created by WebKit Commit Bot on 2018-08-29 10:10:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-08-29 10:10:34 PDT

Size: 12.60 KB

patch

obsolete

>Subversion Revision: 235463
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 57b4e9434dc36df89192ade06ac34fd9f1b4bb43..7f056e38267ccce9e0f5622fc74221279e86a5e9 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-29  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r235436.
>+        https://bugs.webkit.org/show_bug.cgi?id=189085
>+
>+        Is a Swift source breaking change. (Requested by keith_miller
>+        on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Add nullablity attributes to JSValue"
>+        https://bugs.webkit.org/show_bug.cgi?id=189047
>+        https://trac.webkit.org/changeset/235436
>+
> 2018-08-28  Mark Lam  <mark.lam@apple.com>
> 
>         Fix bit-rotted Interpreter::dumpRegisters() and move it to the VMInspector.
>diff --git a/Source/JavaScriptCore/API/JSValue.h b/Source/JavaScriptCore/API/JSValue.h
>index dc47b7a982be53d7ff79d8522d926479157d6b96..df1736ab228655bebe9a4a645b70742f6b1a05fa 100644
>--- a/Source/JavaScriptCore/API/JSValue.h
>+++ b/Source/JavaScriptCore/API/JSValue.h
>@@ -30,8 +30,6 @@
> 
> #import <CoreGraphics/CGGeometry.h>
> 
>-NS_ASSUME_NONNULL_BEGIN
>-
> @class JSContext;
> 
> /*!
>@@ -50,7 +48,7 @@ NS_CLASS_AVAILABLE(10_9, 7_0)
> @interface JSValue : NSObject
> 
> #if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < JSC_MAC_VERSION_TBA) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < JSC_IOS_VERSION_TBA)
>-typedef NSString * JSValueProperty;
>+typedef NSString * _Nonnull JSValueProperty;
> #else
> typedef id _Nullable JSValueProperty;
> #endif
>@@ -59,7 +57,7 @@ typedef id _Nullable JSValueProperty;
> @property
> @abstract The JSContext that this value originates from.
> */
>-@property (readonly, strong) JSContext *context;
>+@property (readonly, strong, nonnull) JSContext *context;
> 
> /*!
> @methodgroup Creating JavaScript Values
>@@ -71,7 +69,7 @@ typedef id _Nullable JSValueProperty;
> @param value The Objective-C object to be converted.
> @result The new JSValue.
> */
>-+ (JSValue *)valueWithObject:(nullable id)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithObject:(nullable id)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -79,7 +77,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting JSValue will be created.
> @result The new JSValue representing the equivalent boolean value.
> */
>-+ (JSValue *)valueWithBool:(BOOL)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithBool:(BOOL)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -87,7 +85,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting JSValue will be created.
> @result The new JSValue representing the equivalent boolean value.
> */
>-+ (JSValue *)valueWithDouble:(double)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithDouble:(double)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -95,7 +93,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting JSValue will be created.
> @result The new JSValue representing the equivalent boolean value.
> */
>-+ (JSValue *)valueWithInt32:(int32_t)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithInt32:(int32_t)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -103,7 +101,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting JSValue will be created.
> @result The new JSValue representing the equivalent boolean value.
> */
>-+ (JSValue *)valueWithUInt32:(uint32_t)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithUInt32:(uint32_t)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -111,7 +109,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting object will be created.
> @result The new JavaScript object.
> */
>-+ (JSValue *)valueWithNewObjectInContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithNewObjectInContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -119,7 +117,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting array will be created.
> @result The new JavaScript array.
> */
>-+ (JSValue *)valueWithNewArrayInContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithNewArrayInContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -129,7 +127,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting regular expression object will be created.
> @result The new JavaScript regular expression object.
> */
>-+ (JSValue *)valueWithNewRegularExpressionFromPattern:(NSString *)pattern flags:(NSString *)flags inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithNewRegularExpressionFromPattern:(nonnull NSString *)pattern flags:(nonnull NSString *)flags inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -138,7 +136,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext in which the resulting error object will be created.
> @result The new JavaScript error object.
> */
>-+ (JSValue *)valueWithNewErrorFromMessage:(NSString *)message inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithNewErrorFromMessage:(nonnull NSString *)message inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -146,7 +144,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext to which the resulting JSValue belongs.
> @result The JSValue representing the JavaScript value <code>null</code>.
> */
>-+ (JSValue *)valueWithNullInContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithNullInContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -154,7 +152,7 @@ typedef id _Nullable JSValueProperty;
> @param context The JSContext to which the resulting JSValue belongs.
> @result The JSValue representing the JavaScript value <code>undefined</code>.
> */
>-+ (JSValue *)valueWithUndefinedInContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithUndefinedInContext:(nonnull JSContext *)context;
> 
> /*!
>  @method
>@@ -163,7 +161,7 @@ typedef id _Nullable JSValueProperty;
>  @param context The JSContext to which the resulting JSValue belongs.
>  @result The JSValue representing a unique JavaScript value with type symbol.
>  */
>-+ (JSValue *)valueWithNewSymbolFromDescription:(NSString *)description inContext:(JSContext *)context JSC_API_AVAILABLE(macosx(JSC_MAC_TBA), ios(JSC_IOS_TBA));
>++ (nonnull JSValue *)valueWithNewSymbolFromDescription:(nonnull NSString *)description inContext:(nonnull JSContext *)context JSC_API_AVAILABLE(macosx(JSC_MAC_TBA), ios(JSC_IOS_TBA));
> 
> /*!
> @methodgroup Converting to Objective-C Types
>@@ -227,7 +225,7 @@ typedef id _Nullable JSValueProperty;
>  If the result is not of the specified Class then <code>nil</code> will be returned.
> @result An Objective-C object of the specified Class or <code>nil</code>.
> */
>-- (nullable id)toObjectOfClass:(Class)expectedClass;
>+- (nullable id)toObjectOfClass:(nonnull Class)expectedClass;
> 
> /*!
> @method
>@@ -330,7 +328,7 @@ typedef id _Nullable JSValueProperty;
>  if the property does not exist.
> @discussion Corresponds to the JavaScript operation <code>object[property]</code>. After macOS TBA and iOS TBA, 'property' can be any 'id' and will be converted to a JSValue using the conversion rules of <code>valueWithObject:inContext:</code>. Prior to macOS TBA and iOS TBA, 'property' was expected to be an NSString *.
> */
>-- (JSValue *)valueForProperty:(JSValueProperty)property;
>+- (nonnull JSValue *)valueForProperty:(JSValueProperty)property;
> 
> /*!
> @method
>@@ -370,7 +368,7 @@ typedef id _Nullable JSValueProperty;
> @result The JSValue for the property at the specified index. 
>  Returns the JavaScript value <code>undefined</code> if no property exists at that index. 
> */
>-- (JSValue *)valueAtIndex:(NSUInteger)index;
>+- (nonnull JSValue *)valueAtIndex:(NSUInteger)index;
> 
> /*!
> @method
>@@ -473,7 +471,7 @@ typedef id _Nullable JSValueProperty;
> @param arguments The arguments to pass to the function.
> @result The return value of the function call. 
> */
>-- (JSValue *)callWithArguments:(nullable NSArray *)arguments;
>+- (nonnull JSValue *)callWithArguments:(nullable NSArray *)arguments;
> 
> /*!
> @method
>@@ -482,7 +480,7 @@ typedef id _Nullable JSValueProperty;
> @param arguments The arguments to pass to the constructor.
> @result The return value of the constructor call.
> */
>-- (JSValue *)constructWithArguments:(nullable NSArray *)arguments;
>+- (nonnull JSValue *)constructWithArguments:(nullable NSArray *)arguments;
> 
> /*!
> @method
>@@ -494,7 +492,7 @@ typedef id _Nullable JSValueProperty;
> @param arguments The arguments to pass to the method.
> @result The return value of the method call.
> */
>-- (JSValue *)invokeMethod:(NSString *)method withArguments:(nullable NSArray *)arguments;
>+- (nonnull JSValue *)invokeMethod:(nonnull NSString *)method withArguments:(nullable NSArray *)arguments;
> 
> @end
> 
>@@ -517,7 +515,7 @@ typedef id _Nullable JSValueProperty;
> @result A newly allocated JavaScript object containing properties
>  named <code>x</code> and <code>y</code>, with values from the CGPoint.
> */
>-+ (JSValue *)valueWithPoint:(CGPoint)point inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithPoint:(CGPoint)point inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -525,7 +523,7 @@ typedef id _Nullable JSValueProperty;
> @result A newly allocated JavaScript object containing properties
>  named <code>location</code> and <code>length</code>, with values from the NSRange.
> */
>-+ (JSValue *)valueWithRange:(NSRange)range inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithRange:(NSRange)range inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -534,7 +532,7 @@ Create a JSValue from a CGRect.
> @result A newly allocated JavaScript object containing properties
>  named <code>x</code>, <code>y</code>, <code>width</code>, and <code>height</code>, with values from the CGRect.
> */
>-+ (JSValue *)valueWithRect:(CGRect)rect inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithRect:(CGRect)rect inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -542,7 +540,7 @@ Create a JSValue from a CGRect.
> @result A newly allocated JavaScript object containing properties
>  named <code>width</code> and <code>height</code>, with values from the CGSize.
> */
>-+ (JSValue *)valueWithSize:(CGSize)size inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithSize:(CGSize)size inContext:(nonnull JSContext *)context;
> 
> /*!
> @method
>@@ -603,8 +601,8 @@ Create a JSValue from a CGRect.
> */
> @interface JSValue (SubscriptSupport)
> 
>-- (JSValue *)objectForKeyedSubscript:(JSValueProperty)key;
>-- (JSValue *)objectAtIndexedSubscript:(NSUInteger)index;
>+- (nonnull JSValue *)objectForKeyedSubscript:(JSValueProperty)key;
>+- (nonnull JSValue *)objectAtIndexedSubscript:(NSUInteger)index;
> - (void)setObject:(nullable id)object forKeyedSubscript:(JSValueProperty)key;
> - (void)setObject:(nullable id)object atIndexedSubscript:(NSUInteger)index;
> 
>@@ -621,14 +619,14 @@ Create a JSValue from a CGRect.
> @abstract Creates a JSValue, wrapping its C API counterpart.
> @result The Objective-C API equivalent of the specified JSValueRef.
> */
>-+ (JSValue *)valueWithJSValueRef:(JSValueRef)value inContext:(JSContext *)context;
>++ (nonnull JSValue *)valueWithJSValueRef:(nonnull JSValueRef)value inContext:(nonnull JSContext *)context;
> 
> /*!
> @property
> @abstract Returns the C API counterpart wrapped by a JSContext.
> @result The C API equivalent of this JSValue.
> */
>-@property (readonly) JSValueRef JSValueRef;
>+@property (readonly, nonnull) JSValueRef JSValueRef;
> @end
> 
> #ifdef __cplusplus
>@@ -667,34 +665,32 @@ extern "C" {
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorWritableKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorWritableKey;
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorEnumerableKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorEnumerableKey;
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorConfigurableKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorConfigurableKey;
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorValueKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorValueKey;
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorGetKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorGetKey;
> /*!
> @const 
> */
>-JS_EXPORT extern NSString * const JSPropertyDescriptorSetKey;
>+JS_EXPORT extern NSString * const _Nonnull JSPropertyDescriptorSetKey;
> 
> #ifdef __cplusplus
> } // extern "C"
> #endif
> 
>-NS_ASSUME_NONNULL_END
>-
> #endif
> 
> #endif // JSValue_h

Actions: View | Formatted Diff | Diff

Attachments on bug 189085: 348408