chakrashim: implement new APIs added in v8

Added new v8 APIs to Chakrashim Context::SetEmbedderData Context::GetEmbedderData Isolate::CancelTerminateExecution Isolate::TerminateExecution Object::DefineOwnProperty Updated v8 version PR-URL: #40 Reviewed-By: Jianchun Xu <[email protected]> Reviewed-By: Kunal Pathak <[email protected]>
nodejs · Mar 21, 2016 · c6d6e6b · c6d6e6b
1 parent 58ff8db
commit c6d6e6b
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 10 deletions.
diff --git a/deps/chakrashim/include/v8-debug.h b/deps/chakrashim/include/v8-debug.h
@@ -54,9 +54,9 @@ class V8_EXPORT Debug {
   static void Dispose();
   static void DisableAgent() {}
   static bool IsAgentEnabled();
-  static void ProcessDebugMessages() {}
-  static Local<Context> GetDebugContext();
-  static void SetMessageHandler(MessageHandler handler) {}
+  static void ProcessDebugMessages(Isolate* isolate) {}
+  static Local<Context> GetDebugContext(Isolate* isolate);
+  static void SetMessageHandler(Isolate* isolate, MessageHandler handler) {}
   static void SendCommand(Isolate* isolate,
                           const uint16_t* command, int length,
                           ClientData* client_data = NULL) {

diff --git a/deps/chakrashim/include/v8-version.h b/deps/chakrashim/include/v8-version.h
@@ -32,9 +32,9 @@
 // NOTE these macros are used by some of the tool scripts and the build
 // system so their names cannot be changed without changing the scripts.
 #define V8_MAJOR_VERSION 4
-#define V8_MINOR_VERSION 8
-#define V8_BUILD_NUMBER 271
-#define V8_PATCH_LEVEL 17
+#define V8_MINOR_VERSION 9
+#define V8_BUILD_NUMBER 385
+#define V8_PATCH_LEVEL 27
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

diff --git a/deps/chakrashim/include/v8.h b/deps/chakrashim/include/v8.h
@@ -308,6 +308,7 @@ class Local {
   template <class F> friend class MaybeLocal;
   template <class F> friend class PersistentBase;
   template <class F, class M> friend class Persistent;
+  template <class F> friend class Local;
   friend V8_EXPORT Local<Primitive> Undefined(Isolate* isolate);
   friend V8_EXPORT Local<Primitive> Null(Isolate* isolate);
   friend V8_EXPORT Local<Boolean> True(Isolate* isolate);
@@ -1268,6 +1269,10 @@ class V8_EXPORT Object : public Value {
   V8_WARN_UNUSED_RESULT Maybe<bool> Set(Local<Context> context, uint32_t index,
                                         Local<Value> value);
 
+  V8_WARN_UNUSED_RESULT Maybe<bool> DefineOwnProperty(
+      Local<Context> context, Local<Name> key, Local<Value> value,
+      PropertyAttribute attributes = None);
+
   V8_DEPRECATE_SOON("Use maybe version",
                     bool ForceSet(Handle<Value> key, Handle<Value> value,
                                   PropertyAttribute attribs = None));
@@ -2208,6 +2213,9 @@ class V8_EXPORT Isolate {
     GCCallback callback, GCType gc_type_filter = kGCTypeAll);
   void RemoveGCEpilogueCallback(GCCallback callback);
 
+  void CancelTerminateExecution();
+  void TerminateExecution();
+
   void SetCounterFunction(CounterLookupCallback);
   void SetCreateHistogramFunction(CreateHistogramCallback);
   void SetAddHistogramSampleFunction(AddHistogramSampleCallback);
@@ -2371,6 +2379,8 @@ class V8_EXPORT Context {
   Isolate* GetIsolate();
   void* GetAlignedPointerFromEmbedderData(int index);
   void SetAlignedPointerInEmbedderData(int index, void* value);
+  void SetEmbedderData(int index, Local<Value> value);
+  Local<Value> GetEmbedderData(int index);
   void SetSecurityToken(Handle<Value> token);
   Handle<Value> GetSecurityToken();
 };

diff --git a/deps/chakrashim/src/v8context.cc b/deps/chakrashim/src/v8context.cc
@@ -98,6 +98,14 @@ void Context::SetAlignedPointerInEmbedderData(int index, void* value) {
   return contextShim->SetAlignedPointerInEmbedderData(index, value);
 }
 
+void Context::SetEmbedderData(int index, Local<Value> value) {
+    SetAlignedPointerInEmbedderData(index, *value);
+}
+
+Local<Value> Context::GetEmbedderData(int index) {
+  return Local<Value>(GetAlignedPointerFromEmbedderData(index));
+}
+
 void Context::SetSecurityToken(Handle<Value> token) {
   // CHAKRA-TODO
 }

diff --git a/deps/chakrashim/src/v8debug.cc b/deps/chakrashim/src/v8debug.cc
@@ -57,9 +57,8 @@ bool Debug::IsAgentEnabled() {
   return g_EnableDebug;
 }
 
-Local<Context> Debug::GetDebugContext() {
+Local<Context> Debug::GetDebugContext(Isolate* isolate) {
   if (g_debugContext == JS_INVALID_REFERENCE) {
-    Isolate* isolate = Isolate::GetCurrent();
     HandleScope scope(isolate);
     g_debugContext = *Context::New(isolate);
     JsAddRef(g_debugContext, nullptr);

diff --git a/deps/chakrashim/src/v8isolate.cc b/deps/chakrashim/src/v8isolate.cc
@@ -136,6 +136,14 @@ void Isolate::AddGCEpilogueCallback(
 void Isolate::RemoveGCEpilogueCallback(GCCallback callback) {
 }
 
+void Isolate::CancelTerminateExecution() {
+  jsrt::IsolateShim::FromIsolate(this)->EnableExecution();
+}
+
+void Isolate::TerminateExecution() {
+  jsrt::IsolateShim::FromIsolate(this)->DisableExecution();
+}
+
 void Isolate::SetCounterFunction(CounterLookupCallback) {
   CHAKRA_UNIMPLEMENTED();
 }

diff --git a/deps/chakrashim/src/v8object.cc b/deps/chakrashim/src/v8object.cc
@@ -129,6 +129,12 @@ Maybe<bool> Object::Set(Local<Context> context,
   return Just(true);
 }
 
+Maybe<bool> Object::DefineOwnProperty(
+    Local<Context> context, Local<Name> key, Local<Value> value,
+    PropertyAttribute attributes) {
+  return Set(key, value, attributes, /*force*/true);
+}
+
 bool Object::Set(uint32_t index, Handle<Value> value) {
   return FromMaybe(Set(Local<Context>(), index, value));
 }

diff --git a/deps/chakrashim/src/v8v8.cc b/deps/chakrashim/src/v8v8.cc
@@ -157,15 +157,15 @@ bool V8::Dispose() {
 }
 
 void V8::TerminateExecution(Isolate* isolate) {
-  jsrt::IsolateShim::FromIsolate(isolate)->DisableExecution();
+  isolate->TerminateExecution();
 }
 
 bool V8::IsExeuctionDisabled(Isolate* isolate) {
   return jsrt::IsolateShim::FromIsolate(isolate)->IsExeuctionDisabled();
 }
 
 void V8::CancelTerminateExecution(Isolate* isolate) {
-  jsrt::IsolateShim::FromIsolate(isolate)->EnableExecution();
+  isolate->CancelTerminateExecution();
 }
 
 void V8::FromJustIsNothing() {