Changeset 276676 in webkit

Timestamp:

Apr 27, 2021, 3:52:55 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Move ExceptionExpectation into its own .h file.
​https://bugs.webkit.org/show_bug.cgi?id=225124

Reviewed by Robin Morisset.

Also fixed some compiler warnings.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/ExceptionExpectation.h: Added.
• runtime/ExceptionHelpers.h:
• runtime/HashMapImplInlines.h:

(JSC::jsMapHashImpl):

• runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::setWithSpecificType):
(JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertySlotByIndex):

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• runtime/ExceptionExpectation.h (added)
• runtime/ExceptionHelpers.h (modified) (1 diff)
• runtime/HashMapImplInlines.h (modified) (2 diffs)
• runtime/JSGenericTypedArrayViewInlines.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -897 +897 @@
     runtime/Exception.h
     runtime/ExceptionEventLocation.h
+    runtime/ExceptionExpectation.h
     runtime/ExceptionHelpers.h
     runtime/ExceptionScope.h

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-04-27  Mark Lam  <mark.lam@apple.com>
+
+        Move ExceptionExpectation into its own .h file.
+        https://bugs.webkit.org/show_bug.cgi?id=225124
+
+        Reviewed by Robin Morisset.
+
+        Also fixed some compiler warnings.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/ExceptionExpectation.h: Added.
+        * runtime/ExceptionHelpers.h:
+        * runtime/HashMapImplInlines.h:
+        (JSC::jsMapHashImpl):
+        * runtime/JSGenericTypedArrayViewInlines.h:
+        (JSC::JSGenericTypedArrayView<Adaptor>::setWithSpecificType):
+        (JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertySlotByIndex):
+
 2021-04-27  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -2017 +2017 @@
                 FEF5B4292628B5240016E776 /* JSSetInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FEF5B4282628B5240016E776 /* JSSetInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 FEF5B42C2628CBC80016E776 /* VMTrapsInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FEF5B42B2628CBC80016E776 /* VMTrapsInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                FEF5B430262A338B0016E776 /* ExceptionExpectation.h in Headers */ = {isa = PBXBuildFile; fileRef = FEF5B42F262A338B0016E776 /* ExceptionExpectation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 FEFD6FC61D5E7992008F2F0B /* JSStringInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FEFD6FC51D5E7970008F2F0B /* JSStringInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
 /* End PBXBuildFile section */
@@ -5428 +5429 @@
                 FEF5B4282628B5240016E776 /* JSSetInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSetInlines.h; sourceTree = "<group>"; };
                 FEF5B42B2628CBC80016E776 /* VMTrapsInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMTrapsInlines.h; sourceTree = "<group>"; };
+                FEF5B42F262A338B0016E776 /* ExceptionExpectation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionExpectation.h; sourceTree = "<group>"; };
                 FEFD6FC51D5E7970008F2F0B /* JSStringInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringInlines.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -7346 +7348 @@
                                 FE80C19A1D7768FD008510C0 /* ExceptionEventLocation.cpp */,
                                 FE6029D81D6E1E330030204D /* ExceptionEventLocation.h */,
+                                FEF5B42F262A338B0016E776 /* ExceptionExpectation.h */,
                                 0F12DE0D1979D5FD0006FF4E /* ExceptionFuzz.cpp */,
                                 0F12DE0E1979D5FD0006FF4E /* ExceptionFuzz.h */,
@@ -10745 +10748 @@
                                 ADE8029C1E08F1DE0058DE78 /* WebAssemblyLinkErrorPrototype.h in Headers */,
                                 AD2FCBF51DB58DAD00B3E736 /* WebAssemblyMemoryConstructor.h in Headers */,
+                                FEF5B430262A338B0016E776 /* ExceptionExpectation.h in Headers */,
                                 AD2FCC1A1DB59CB200B3E736 /* WebAssemblyMemoryConstructor.lut.h in Headers */,
                                 AD2FCBF71DB58DAD00B3E736 /* WebAssemblyMemoryPrototype.h in Headers */,

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h

@@ -36 +36 @@
 
 namespace JSC {
-
-enum class ExceptionExpectation {
-    CanThrow,
-    ShouldNotThrow
-};
 
 typedef JSObject* (*ErrorFactory)(JSGlobalObject*, const String&, ErrorInstance::SourceAppender);

trunk/Source/JavaScriptCore/runtime/HashMapImplInlines.h

@@ -26 +26 @@
 #pragma once
 
+#include "ExceptionExpectation.h"
 #include "HashMapImpl.h"
 #include "JSCJSValueInlines.h"
@@ -97 +98 @@
             RETURN_IF_EXCEPTION(scope, UINT_MAX);
         else
-            EXCEPTION_ASSERT(!scope.exception());
+            EXCEPTION_ASSERT_UNUSED(scope, !scope.exception());
         return wtfString.impl()->hash();
     }

trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h

@@ -176 +176 @@
     RELEASE_ASSERT(other->canAccessRangeQuickly(otherOffset, length));
     bool success = validateRange(globalObject, offset, length);
-    EXCEPTION_ASSERT(!scope.exception() == success);
+    EXCEPTION_ASSERT_UNUSED(scope, !scope.exception() == success);
     if (!success)
         return false;
@@ -464 +464 @@
 
     JSValue value;
-    if constexpr (Adaptor::canConvertToJSQuickly)
+    if constexpr (Adaptor::canConvertToJSQuickly) {
+        UNUSED_VARIABLE(scope);
         value = thisObject->getIndexQuickly(propertyName);
-    else {
+    } else {
         auto nativeValue = thisObject->getIndexQuicklyAsNativeValue(propertyName);
         value = Adaptor::toJSValue(globalObject, nativeValue);