Title: [289952] branches/safari-613.1.17.1-branch
- Revision
- 289952
- Author
- repst...@apple.com
- Date
- 2022-02-16 13:49:31 -0800 (Wed, 16 Feb 2022)
Log Message
Revert r289919. rdar://problem/81337114
Modified Paths
Removed Paths
Diff
Modified: branches/safari-613.1.17.1-branch/JSTests/ChangeLog (289951 => 289952)
--- branches/safari-613.1.17.1-branch/JSTests/ChangeLog 2022-02-16 21:43:54 UTC (rev 289951)
+++ branches/safari-613.1.17.1-branch/JSTests/ChangeLog 2022-02-16 21:49:31 UTC (rev 289952)
@@ -1,5 +1,9 @@
2022-02-16 Russell Epstein <repst...@apple.com>
+ Revert r289919. rdar://problem/81337114
+
+2022-02-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r289877. rdar://problem/81337114
Defer TerminationsExceptions while in operationMaterializeObjectInOSR.
Deleted: branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-debug.js (289951 => 289952)
--- branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-debug.js 2022-02-16 21:43:54 UTC (rev 289951)
+++ branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-debug.js 2022-02-16 21:49:31 UTC (rev 289952)
@@ -1,22 +0,0 @@
-//@ skip if $buildType == "release"
-//@ runDefault("--watchdog=100", "--watchdog-exception-ok")
-
-function baz(c) {
- if (c) {
- $vm.haveABadTime();
- }
-}
-noInline(baz);
-
-function bar() {}
-
-function foo(c, ...args) {
- let args2 = [...args];
- baz(c);
- bar.apply(undefined, args2);
-}
-
-for (let i = 0; i < 70000; i++) {
- foo(false, 0);
-}
-foo(true, 0);
Deleted: branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-release.js (289951 => 289952)
--- branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-release.js 2022-02-16 21:43:54 UTC (rev 289951)
+++ branches/safari-613.1.17.1-branch/JSTests/stress/termination-exception-in-operationMaterializeObjectInOSR-release.js 2022-02-16 21:49:31 UTC (rev 289952)
@@ -1,22 +0,0 @@
-//@ skip if $buildType == "debug"
-//@ runDefault("--watchdog=4", "--watchdog-exception-ok")
-
-function baz(c) {
- if (c) {
- $vm.haveABadTime();
- }
-}
-noInline(baz);
-
-function bar() {}
-
-function foo(c, ...args) {
- let args2 = [...args];
- baz(c);
- bar.apply(undefined, args2);
-}
-
-for (let i = 0; i < 70000; i++) {
- foo(false, 0);
-}
-foo(true, 0);
Modified: branches/safari-613.1.17.1-branch/Source/_javascript_Core/ChangeLog (289951 => 289952)
--- branches/safari-613.1.17.1-branch/Source/_javascript_Core/ChangeLog 2022-02-16 21:43:54 UTC (rev 289951)
+++ branches/safari-613.1.17.1-branch/Source/_javascript_Core/ChangeLog 2022-02-16 21:49:31 UTC (rev 289952)
@@ -1,5 +1,9 @@
2022-02-16 Russell Epstein <repst...@apple.com>
+ Revert r289919. rdar://problem/81337114
+
+2022-02-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r289877. rdar://problem/81337114
Defer TerminationsExceptions while in operationMaterializeObjectInOSR.
Modified: branches/safari-613.1.17.1-branch/Source/_javascript_Core/ftl/FTLOperations.cpp (289951 => 289952)
--- branches/safari-613.1.17.1-branch/Source/_javascript_Core/ftl/FTLOperations.cpp 2022-02-16 21:43:54 UTC (rev 289951)
+++ branches/safari-613.1.17.1-branch/Source/_javascript_Core/ftl/FTLOperations.cpp 2022-02-16 21:49:31 UTC (rev 289952)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2022 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@
#include "JSMapIterator.h"
#include "JSSetIterator.h"
#include "RegExpObject.h"
-#include "VMTrapsInlines.h"
#include <wtf/Assertions.h>
IGNORE_WARNINGS_BEGIN("frame-address")
@@ -190,10 +189,6 @@
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
- // It's too hairy to handle TerminationExceptions during OSR object materialization.
- // Let's just wait until after.
- DeferTermination deferTermination(vm);
-
// We cannot GC. We've got pointers in evil places.
DeferGCForAWhile deferGC(vm);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
