summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorOle André Vadla Ravnås <oleavr@gmail.com>2020-11-06 02:46:17 +0100
committerMichaël Zasso <targos@protonmail.com>2020-11-15 16:47:45 +0100
commit25a2d98c50ca87b08cc415b140826e2aacf1fb19 (patch)
treee6e511188a6add370d9bdbb242cd06fbba4e509d /deps
parent15c91c6dd519c1dacb9e89139d5fac9221885e76 (diff)
downloadios-node-v8-25a2d98c50ca87b08cc415b140826e2aacf1fb19.tar.gz
ios-node-v8-25a2d98c50ca87b08cc415b140826e2aacf1fb19.tar.bz2
ios-node-v8-25a2d98c50ca87b08cc415b140826e2aacf1fb19.zip
deps: V8: cherry-pick 086eecbd96b6
Original commit message: [platform] Add Permission::kNoAccessWillJitLater enum value This value is unused for now. This CL is part 1 of a 3-step dance. Part 2 will be teaching Chrome's Platform implementation to accept the new value. Part 3 will then actually use it in V8. Bug: chromium:1117591 Change-Id: Ie3aed20d4cc58f3def3be2a3a03bba4c3a37bf44 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2450056 Commit-Queue: Jakob Kummerow <jkummerow@chromium.org> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/master@{#70335} PR-URL: https://github.com/nodejs/node/pull/35986 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/include/v8-platform.h8
-rw-r--r--deps/v8/test/unittests/heap/unmapper-unittest.cc1
2 files changed, 8 insertions, 1 deletions
diff --git a/deps/v8/include/v8-platform.h b/deps/v8/include/v8-platform.h
index 7bb79a1841..6669ed9ac7 100644
--- a/deps/v8/include/v8-platform.h
+++ b/deps/v8/include/v8-platform.h
@@ -383,7 +383,13 @@ class PageAllocator {
kReadWrite,
// TODO(hpayer): Remove this flag. Memory should never be rwx.
kReadWriteExecute,
- kReadExecute
+ kReadExecute,
+ // Set this when reserving memory that will later require kReadWriteExecute
+ // permissions. The resulting behavior is platform-specific, currently
+ // this is used to set the MAP_JIT flag on Apple Silicon.
+ // TODO(jkummerow): Remove this when Wasm has a platform-independent
+ // w^x implementation.
+ kNoAccessWillJitLater
};
/**
diff --git a/deps/v8/test/unittests/heap/unmapper-unittest.cc b/deps/v8/test/unittests/heap/unmapper-unittest.cc
index bd476cd1ec..a919945d3f 100644
--- a/deps/v8/test/unittests/heap/unmapper-unittest.cc
+++ b/deps/v8/test/unittests/heap/unmapper-unittest.cc
@@ -170,6 +170,7 @@ class TrackingPageAllocator : public ::v8::PageAllocator {
os << " page: [" << start << ", " << end << "), access: ";
switch (access) {
case PageAllocator::kNoAccess:
+ case PageAllocator::kNoAccessWillJitLater:
os << "--";
break;
case PageAllocator::kRead: