Skip to content

Commit 5715596

Browse files
kmiller68kmiller68
committed
Rename CatchScope to TopExceptionScope
https://bugs.webkit.org/show_bug.cgi?id=306040 rdar://168684123 Reviewed by Yusuke Suzuki. Pretty straightforward refactor no major code changes. I did have to move TemporalPlainYearMonth::addDurationToYearMonth to a header file to work around unified source changes from renaming CatchScope.cpp to TopExceptionScope.cpp. No new tests, just a rename. Canonical link: https://commits.webkit.org/306034@main
1 parent 77c9af2 commit 5715596

110 files changed

Lines changed: 380 additions & 380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/APIUtils.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
#ifndef APIUtils_h
2727
#define APIUtils_h
2828

29-
#include "CatchScope.h"
3029
#include "Exception.h"
3130
#include "JSCJSValue.h"
3231
#include "JSGlobalObjectInspectorController.h"
3332
#include "JSValueRef.h"
33+
#include "TopExceptionScope.h"
3434

3535
enum class ExceptionStatus {
3636
DidThrow,
3737
DidNotThrow
3838
};
3939

40-
inline ExceptionStatus handleExceptionIfNeeded(JSC::CatchScope& scope, JSContextRef ctx, JSValueRef* returnedExceptionRef)
40+
inline ExceptionStatus handleExceptionIfNeeded(JSC::TopExceptionScope& scope, JSContextRef ctx, JSValueRef* returnedExceptionRef)
4141
{
4242
JSC::JSGlobalObject* globalObject = toJS(ctx);
4343
if (scope.exception()) [[unlikely]] {

‎Source/JavaScriptCore/API/JSAPIGlobalObject.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
#import "APICast.h"
3232
#import "CallFrameInlines.h"
33-
#import "CatchScope.h"
3433
#import "Completion.h"
3534
#import "Error.h"
3635
#import "Exception.h"
@@ -51,6 +50,7 @@
5150
#import "ObjectConstructor.h"
5251
#import "SourceOrigin.h"
5352
#import "StrongInlines.h"
53+
#import "TopExceptionScope.h"
5454
#import <wtf/URL.h>
5555
#import <wtf/text/MakeString.h>
5656

‎Source/JavaScriptCore/API/JSContext.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ - (JSValue *)evaluateJSScript:(JSScript *)script
141141
if (!apiGlobalObject)
142142
return [JSValue valueWithNewPromiseRejectedWithReason:[JSValue valueWithNewErrorFromMessage:@"Context does not support module loading" inContext:self] inContext:self];
143143

144-
auto scope = DECLARE_CATCH_SCOPE(vm);
144+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
145145
JSC::JSValue result = apiGlobalObject->loadAndEvaluateJSScriptModule(locker, script);
146146
if (scope.exception()) {
147147
JSValueRef exceptionValue = toRef(apiGlobalObject, scope.exception()->value());
@@ -164,7 +164,7 @@ - (JSValue *)dependencyIdentifiersForModuleJSScript:(JSScript *)script
164164
return [JSValue valueWithUndefinedInContext:self];
165165
}
166166

167-
auto scope = DECLARE_CATCH_SCOPE(vm);
167+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
168168
JSC::JSArray* result = globalObject->moduleLoader()->dependencyKeysIfEvaluated(globalObject, JSC::jsString(vm, String([[script sourceURL] absoluteString])));
169169
if (scope.exception()) {
170170
JSValueRef exceptionValue = toRef(globalObject, scope.exception()->value());

‎Source/JavaScriptCore/API/JSObjectRef.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned pa
138138
JSGlobalObject* globalObject = toJS(ctx);
139139
VM& vm = globalObject->vm();
140140
JSLockHolder locker(vm);
141-
auto scope = DECLARE_CATCH_SCOPE(vm);
141+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
142142

143143
startingLineNumber = std::max(1, startingLineNumber);
144144
Identifier nameID = name ? name->identifier(&vm) : Identifier::fromString(vm, "anonymous"_s);
@@ -171,7 +171,7 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa
171171
JSGlobalObject* globalObject = toJS(ctx);
172172
VM& vm = globalObject->vm();
173173
JSLockHolder locker(vm);
174-
auto scope = DECLARE_CATCH_SCOPE(vm);
174+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
175175

176176
JSObject* result;
177177
if (argumentCount) {
@@ -205,7 +205,7 @@ JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSVal
205205
JSGlobalObject* globalObject = toJS(ctx);
206206
VM& vm = globalObject->vm();
207207
JSLockHolder locker(vm);
208-
auto scope = DECLARE_CATCH_SCOPE(vm);
208+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
209209

210210
MarkedArgumentBuffer argList;
211211
argList.ensureCapacity(argumentCount);
@@ -234,7 +234,7 @@ JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSVa
234234
JSGlobalObject* globalObject = toJS(ctx);
235235
VM& vm = globalObject->vm();
236236
JSLockHolder locker(vm);
237-
auto scope = DECLARE_CATCH_SCOPE(vm);
237+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
238238

239239
JSValue message = argumentCount ? toJS(globalObject, arguments[0]) : jsUndefined();
240240
JSValue options = argumentCount > 1 ? toJS(globalObject, arguments[1]) : jsUndefined();
@@ -256,7 +256,7 @@ JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSV
256256
JSGlobalObject* globalObject = toJS(ctx);
257257
VM& vm = globalObject->vm();
258258
JSLockHolder locker(vm);
259-
auto scope = DECLARE_CATCH_SCOPE(vm);
259+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
260260

261261
MarkedArgumentBuffer argList;
262262
argList.ensureCapacity(argumentCount);
@@ -286,7 +286,7 @@ JSObjectRef JSObjectMakeDeferredPromise(JSContextRef ctx, JSObjectRef* resolve,
286286
JSGlobalObject* globalObject = toJS(ctx);
287287
VM& vm = globalObject->vm();
288288
JSLockHolder locker(globalObject);
289-
auto scope = DECLARE_CATCH_SCOPE(vm);
289+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
290290

291291
JSPromise::DeferredData data = JSPromise::createDeferredData(globalObject, globalObject->promiseConstructor());
292292
if (handleExceptionIfNeeded(scope, ctx, exception) == ExceptionStatus::DidThrow)
@@ -321,7 +321,7 @@ void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value
321321
JSGlobalObject* globalObject = toJS(ctx);
322322
VM& vm = globalObject->vm();
323323
JSLockHolder locker(vm);
324-
auto scope = DECLARE_CATCH_SCOPE(vm);
324+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
325325

326326
JSObject* jsObject = toJS(object);
327327
JSValue jsValue = toJS(globalObject, value);
@@ -353,7 +353,7 @@ JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef
353353
JSGlobalObject* globalObject = toJS(ctx);
354354
VM& vm = globalObject->vm();
355355
JSLockHolder locker(vm);
356-
auto scope = DECLARE_CATCH_SCOPE(vm);
356+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
357357

358358
JSObject* jsObject = toJS(object);
359359

@@ -372,7 +372,7 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope
372372
JSGlobalObject* globalObject = toJS(ctx);
373373
VM& vm = globalObject->vm();
374374
JSLockHolder locker(vm);
375-
auto scope = DECLARE_CATCH_SCOPE(vm);
375+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
376376

377377
JSObject* jsObject = toJS(object);
378378
Identifier name(propertyName->identifier(&vm));
@@ -400,7 +400,7 @@ bool JSObjectHasPropertyForKey(JSContextRef ctx, JSObjectRef object, JSValueRef
400400
JSGlobalObject* globalObject = toJS(ctx);
401401
VM& vm = globalObject->vm();
402402
JSLockHolder locker(vm);
403-
auto scope = DECLARE_CATCH_SCOPE(vm);
403+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
404404

405405
JSObject* jsObject = toJS(object);
406406
Identifier ident = toJS(globalObject, key).toPropertyKey(globalObject);
@@ -422,7 +422,7 @@ JSValueRef JSObjectGetPropertyForKey(JSContextRef ctx, JSObjectRef object, JSVal
422422
JSGlobalObject* globalObject = toJS(ctx);
423423
VM& vm = globalObject->vm();
424424
JSLockHolder locker(vm);
425-
auto scope = DECLARE_CATCH_SCOPE(vm);
425+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
426426

427427
JSObject* jsObject = toJS(object);
428428
Identifier ident = toJS(globalObject, key).toPropertyKey(globalObject);
@@ -444,7 +444,7 @@ void JSObjectSetPropertyForKey(JSContextRef ctx, JSObjectRef object, JSValueRef
444444
JSGlobalObject* globalObject = toJS(ctx);
445445
VM& vm = globalObject->vm();
446446
JSLockHolder locker(vm);
447-
auto scope = DECLARE_CATCH_SCOPE(vm);
447+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
448448

449449
JSObject* jsObject = toJS(object);
450450
JSValue jsValue = toJS(globalObject, value);
@@ -475,7 +475,7 @@ bool JSObjectDeletePropertyForKey(JSContextRef ctx, JSObjectRef object, JSValueR
475475
JSGlobalObject* globalObject = toJS(ctx);
476476
VM& vm = globalObject->vm();
477477
JSLockHolder locker(vm);
478-
auto scope = DECLARE_CATCH_SCOPE(vm);
478+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
479479

480480
JSObject* jsObject = toJS(object);
481481
Identifier ident = toJS(globalObject, key).toPropertyKey(globalObject);
@@ -497,7 +497,7 @@ JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsi
497497
JSGlobalObject* globalObject = toJS(ctx);
498498
VM& vm = globalObject->vm();
499499
JSLockHolder locker(vm);
500-
auto scope = DECLARE_CATCH_SCOPE(vm);
500+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
501501

502502
JSObject* jsObject = toJS(object);
503503

@@ -517,7 +517,7 @@ void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned p
517517
JSGlobalObject* globalObject = toJS(ctx);
518518
VM& vm = globalObject->vm();
519519
JSLockHolder locker(vm);
520-
auto scope = DECLARE_CATCH_SCOPE(vm);
520+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
521521

522522
JSObject* jsObject = toJS(object);
523523
JSValue jsValue = toJS(globalObject, value);
@@ -535,7 +535,7 @@ bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef pr
535535
JSGlobalObject* globalObject = toJS(ctx);
536536
VM& vm = globalObject->vm();
537537
JSLockHolder locker(vm);
538-
auto scope = DECLARE_CATCH_SCOPE(vm);
538+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
539539

540540
JSObject* jsObject = toJS(object);
541541

@@ -711,7 +711,7 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
711711
JSGlobalObject* globalObject = toJS(ctx);
712712
VM& vm = globalObject->vm();
713713
JSLockHolder locker(vm);
714-
auto scope = DECLARE_CATCH_SCOPE(vm);
714+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
715715

716716
if (!object)
717717
return nullptr;
@@ -758,7 +758,7 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size
758758
JSGlobalObject* globalObject = toJS(ctx);
759759
VM& vm = globalObject->vm();
760760
JSLockHolder locker(vm);
761-
auto scope = DECLARE_CATCH_SCOPE(vm);
761+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
762762

763763
if (!object)
764764
return nullptr;

‎Source/JavaScriptCore/API/JSTypedArray.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ JSObjectRef JSObjectMakeTypedArray(JSContextRef ctx, JSTypedArrayType arrayType,
158158
JSGlobalObject* globalObject = toJS(ctx);
159159
VM& vm = globalObject->vm();
160160
JSLockHolder locker(vm);
161-
auto scope = DECLARE_CATCH_SCOPE(vm);
161+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
162162

163163
if (arrayType == kJSTypedArrayTypeNone || arrayType == kJSTypedArrayTypeArrayBuffer)
164164
return nullptr;
@@ -177,7 +177,7 @@ JSObjectRef JSObjectMakeTypedArrayWithBytesNoCopy(JSContextRef ctx, JSTypedArray
177177
JSGlobalObject* globalObject = toJS(ctx);
178178
VM& vm = globalObject->vm();
179179
JSLockHolder locker(vm);
180-
auto scope = DECLARE_CATCH_SCOPE(vm);
180+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
181181

182182
if (arrayType == kJSTypedArrayTypeNone || arrayType == kJSTypedArrayTypeArrayBuffer)
183183
return nullptr;
@@ -199,7 +199,7 @@ JSObjectRef JSObjectMakeTypedArrayWithArrayBuffer(JSContextRef ctx, JSTypedArray
199199
JSGlobalObject* globalObject = toJS(ctx);
200200
VM& vm = globalObject->vm();
201201
JSLockHolder locker(vm);
202-
auto scope = DECLARE_CATCH_SCOPE(vm);
202+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
203203

204204
if (arrayType == kJSTypedArrayTypeNone || arrayType == kJSTypedArrayTypeArrayBuffer)
205205
return nullptr;
@@ -227,7 +227,7 @@ JSObjectRef JSObjectMakeTypedArrayWithArrayBufferAndOffset(JSContextRef ctx, JST
227227
JSGlobalObject* globalObject = toJS(ctx);
228228
VM& vm = globalObject->vm();
229229
JSLockHolder locker(vm);
230-
auto scope = DECLARE_CATCH_SCOPE(vm);
230+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
231231

232232
if (arrayType == kJSTypedArrayTypeNone || arrayType == kJSTypedArrayTypeArrayBuffer)
233233
return nullptr;
@@ -315,7 +315,7 @@ JSObjectRef JSObjectMakeArrayBufferWithBytesNoCopy(JSContextRef ctx, void* bytes
315315
JSGlobalObject* globalObject = toJS(ctx);
316316
VM& vm = globalObject->vm();
317317
JSLockHolder locker(vm);
318-
auto scope = DECLARE_CATCH_SCOPE(vm);
318+
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
319319

320320
auto buffer = ArrayBuffer::createFromBytes({ static_cast<const uint8_t*>(bytes), byteLength }, createSharedTask<void(void*)>([=](void* p) {
321321
if (bytesDeallocator)

0 commit comments

Comments
 (0)