commit 4a90d5fbbb6802c59093b866f3478a814bf02b95
author Ben Murdoch <benm@google.com> Tue Mar 22 12:00:34 2016 +0000
committer Dirk Vogt <dirk@fairphone.com> Fri Mar 17 16:05:42 2017 +0100
tree 486867e3a04e7f17454c94a4c97891bb0e237f1f
parent 3821a70061b1b2077ee51c70eda717bddac94f58

Upgrade V8 to version 4.9.385.28

https://chromium.googlesource.com/v8/v8/+/4.9.385.28

FPIIM-449

Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4

src/vm-state.h

diff --git a/src/vm-state.h b/src/vm-state.h
index 9838b87..7e723a5 100644
--- a/src/vm-state.h
+++ b/src/vm-state.h
@@ -33,7 +33,14 @@
   inline ExternalCallbackScope(Isolate* isolate, Address callback);
   inline ~ExternalCallbackScope();
   Address callback() { return callback_; }
-  Address* callback_address() { return &callback_; }
+  Address* callback_entrypoint_address() {
+    if (callback_ == nullptr) return nullptr;
+#if USES_FUNCTION_DESCRIPTORS
+    return FUNCTION_ENTRYPOINT_ADDRESS(callback_);
+#else
+    return &callback_;
+#endif
+  }
   ExternalCallbackScope* previous() { return previous_scope_; }
   inline Address scope_address();
 
@@ -46,7 +53,8 @@
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_VM_STATE_H_