diff options
| author | Michaël Zasso <targos@protonmail.com> | 2018-12-04 08:20:37 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2018-12-06 15:23:33 +0100 |
| commit | 9b4bf7de6c9a7c25f116c7a502384c20b5cfaea3 (patch) | |
| tree | 2b0c843168dafb939d8df8a15b2aa72b76dee51d /deps/v8/src/base/platform/platform-fuchsia.cc | |
| parent | b8fbe69db1292307adb2c2b2e0d5ef48c4ab2faf (diff) | |
| download | android-node-v8-9b4bf7de6c9a7c25f116c7a502384c20b5cfaea3.tar.gz android-node-v8-9b4bf7de6c9a7c25f116c7a502384c20b5cfaea3.tar.bz2 android-node-v8-9b4bf7de6c9a7c25f116c7a502384c20b5cfaea3.zip | |
deps: update V8 to 7.1.302.28
PR-URL: https://github.com/nodejs/node/pull/23423
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/src/base/platform/platform-fuchsia.cc')
| -rw-r--r-- | deps/v8/src/base/platform/platform-fuchsia.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/deps/v8/src/base/platform/platform-fuchsia.cc b/deps/v8/src/base/platform/platform-fuchsia.cc index d1979fb9d8..713ee404bd 100644 --- a/deps/v8/src/base/platform/platform-fuchsia.cc +++ b/deps/v8/src/base/platform/platform-fuchsia.cc @@ -57,8 +57,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, strlen(kVirtualMemoryName)); uintptr_t reservation; uint32_t prot = GetProtectionFromMemoryPermission(access); - zx_status_t status = zx_vmar_map_old(zx_vmar_root_self(), 0, vmo, 0, - request_size, prot, &reservation); + zx_status_t status = zx_vmar_map(zx_vmar_root_self(), prot, 0, vmo, 0, + request_size, &reservation); // Either the vmo is now referenced by the vmar, or we failed and are bailing, // so close the vmo either way. zx_handle_close(vmo); @@ -67,7 +67,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment, } uint8_t* base = reinterpret_cast<uint8_t*>(reservation); - uint8_t* aligned_base = RoundUp(base, alignment); + uint8_t* aligned_base = reinterpret_cast<uint8_t*>( + RoundUp(reinterpret_cast<uintptr_t>(base), alignment)); // Unmap extra memory reserved before and after the desired block. if (aligned_base != base) { @@ -114,9 +115,8 @@ bool OS::SetPermissions(void* address, size_t size, MemoryPermission access) { DCHECK_EQ(0, reinterpret_cast<uintptr_t>(address) % CommitPageSize()); DCHECK_EQ(0, size % CommitPageSize()); uint32_t prot = GetProtectionFromMemoryPermission(access); - return zx_vmar_protect_old(zx_vmar_root_self(), - reinterpret_cast<uintptr_t>(address), size, - prot) == ZX_OK; + return zx_vmar_protect(zx_vmar_root_self(), prot, + reinterpret_cast<uintptr_t>(address), size) == ZX_OK; } // static |