Skip to content

Commit 155783d

Browse files
saperrvagg
saper
authored andcommitted
deps: backport 75e43a6 from v8 upstream (again)
Note: When this was cherry-picked for v8 v4.4 (landed in #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: #2692 Reviewed-By: ofrobots - Ali Ijaz Sheikh <ofrobots@google.com> 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<Smi*>(NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ test/cctest/test-heap.cc:131:20: error: reinterpret_cast from 'nullptr_t' to 'v8::internal::Object *' is not allowed Handle<Object> n(reinterpret_cast<Object*>(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<Address>(NULL); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +add myself to the AUTHORS file. BUG= Review URL: https://codereview.chromium.org/1277353002 Cr-Commit-Position: refs/heads/master@{#30103}
1 parent 5652ce0 commit 155783d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/v8/test/cctest/test-heap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,7 @@ TEST(TestAlignmentCalculations) {
18551855
Heap::GetMaximumFillToAlign(kSimd128Unaligned);
18561856
CHECK_EQ(maximum_simd128_misalignment, max_simd128_unaligned_fill);
18571857

1858-
Address base = reinterpret_cast<Address>(NULL);
1858+
Address base = static_cast<Address>(NULL);
18591859
int fill = 0;
18601860

18611861
// Word alignment never requires fill.

0 commit comments

Comments
 (0)