From b4f1711a629251f6aab7615907fe7358881e0648 Mon Sep 17 00:00:00 2001 From: saper Date: Tue, 11 Aug 2015 00:48:49 -0700 Subject: [PATCH] deps: backport 75e43a6 from v8 upstream (again) Note: When this was cherry-picked for v8 v4.4 (landed in nodejs#2636), test-heap.cc:1989 chunk did not exist. It now exists in v8 v4.5.103.30. This PR completes the cherry pick of the whole commit from v8. PR-URL: https://github.com/nodejs/node/pull/2692 Reviewed-By: ofrobots - Ali Ijaz Sheikh Original commit message: Use static_cast<> for NULL (clang 3.7) The following errors come up when compiling v8 with clang 3.7 on FreeBSD/amd64: src/runtime/runtime-i18n.cc:629:37: error: reinterpret_cast from 'nullptr_t' to 'v8::internal::Smi *' is not allowed local_object->SetInternalField(1, reinterpret_cast(NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ test/cctest/test-heap.cc:131:20: error: reinterpret_cast from 'nullptr_t' to 'v8::internal::Object *' is not allowed Handle n(reinterpret_cast(NULL), isolate); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test/cctest/test-heap.cc:1989:18: error: reinterpret_cast from 'nullptr_t' to 'Address' (aka 'unsigned char *') is not allowed Address base = reinterpret_cast
(NULL); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +add myself to the AUTHORS file. BUG= Review URL: https://codereview.chromium.org/1277353002 Cr-Commit-Position: refs/heads/master@{#30103} --- deps/v8/test/cctest/test-heap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/v8/test/cctest/test-heap.cc b/deps/v8/test/cctest/test-heap.cc index d85310225aed34..848c76886067b5 100644 --- a/deps/v8/test/cctest/test-heap.cc +++ b/deps/v8/test/cctest/test-heap.cc @@ -1855,7 +1855,7 @@ TEST(TestAlignmentCalculations) { Heap::GetMaximumFillToAlign(kSimd128Unaligned); CHECK_EQ(maximum_simd128_misalignment, max_simd128_unaligned_fill); - Address base = reinterpret_cast
(NULL); + Address base = static_cast
(NULL); int fill = 0; // Word alignment never requires fill.