Commit 714e96e
deps: backport 75e43a6 from v8 upstream
Note: chunk in test-heap.cc:1989 discarded as related code missing
from current version in node.
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}
PR-URL: #2636
Reviewed-By: thefourtheye - Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>1 parent 8a9a3bf commit 714e96e
3 files changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -69,6 +69,7 @@ Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu> | |||
| 69 | 69 | Luis Reis <luis.m.reis@gmail.com> | |
| 70 | 70 | Luke Zarko <lukezarko@gmail.com> | |
| 71 | 71 | Maciej Małecki <me@mmalecki.com> | |
| 72 | + Marcin Cieślak <saper@marcincieslak.com> | ||
| 72 | 73 | Mathias Bynens <mathias@qiwi.be> | |
| 73 | 74 | Matt Hanselman <mjhanselman@gmail.com> | |
| 74 | 75 | Matthew Sporleder <msporleder@gmail.com> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -627,7 +627,7 @@ RUNTIME_FUNCTION(Runtime_CreateBreakIterator) { | |||
| 627 | 627 | ||
| 628 | 628 | local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator)); | |
| 629 | 629 | // Make sure that the pointer to adopted text is NULL. | |
| 630 | - local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL)); | ||
| 630 | + local_object->SetInternalField(1, static_cast<Smi*>(nullptr)); | ||
| 631 | 631 | ||
| 632 | 632 | Factory* factory = isolate->factory(); | |
| 633 | 633 | Handle<String> key = factory->NewStringFromStaticChars("breakIterator"); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -126,7 +126,7 @@ TEST(HandleNull) { | |||
| 126 | 126 | Isolate* isolate = CcTest::i_isolate(); | |
| 127 | 127 | HandleScope outer_scope(isolate); | |
| 128 | 128 | LocalContext context; | |
| 129 | - Handle<Object> n(reinterpret_cast<Object*>(NULL), isolate); | ||
| 129 | + Handle<Object> n(static_cast<Object*>(nullptr), isolate); | ||
| 130 | 130 | CHECK(!n.is_null()); | |
| 131 | 131 | } | |
| 132 | 132 | ||
0 commit comments