Pass Isolate pointer to v8::String::Utf8Value constructors, closes #46

pinepain · pinepain · commit 30504431ae6f · 2017-09-03T17:05:53.000+03:00
diff --git a/scripts/test_v8/hello_world.cpp b/scripts/test_v8/hello_world.cpp
@@ -78,7 +78,7 @@ int main(int argc, char* argv[]) {
     Local<Value> result = script->Run();
 
     // Convert the result to an UTF8 string and print it.
-    String::Utf8Value utf8(result);
+    String::Utf8Value utf8(isolate, result);
     printf("%s\n", *utf8);
   }
 
diff --git a/src/php_v8_exceptions.cc b/src/php_v8_exceptions.cc
@@ -52,6 +52,7 @@ void php_v8_create_try_catch_exception(zval *return_value, php_v8_isolate_t *php
     const char *message = NULL;
 
     PHP_V8_DECLARE_LIMITS(php_v8_isolate);
+    PHP_V8_DECLARE_ISOLATE(php_v8_isolate);
 
     if ((try_catch == NULL) || (try_catch->Exception()->IsNull() && try_catch->Message().IsEmpty() && !try_catch->CanContinue() && try_catch->HasTerminated())) {
         if (limits->time_limit_hit) {
@@ -68,10 +69,9 @@ void php_v8_create_try_catch_exception(zval *return_value, php_v8_isolate_t *php
         object_init_ex(return_value, ce);
         zend_update_property_string(php_v8_try_catch_exception_class_entry, return_value, ZEND_STRL("message"), message);
     } else {
-        v8::String::Utf8Value exception(try_catch->Exception());
-
         ce = php_v8_try_catch_exception_class_entry;
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK_NODECL(exception, message);
+
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING_NODECL(isolate, message, try_catch->Exception());
 
         object_init_ex(return_value, ce);
         zend_update_property_string(php_v8_try_catch_exception_class_entry, return_value, ZEND_STRL("message"), message);
diff --git a/src/php_v8_message.cc b/src/php_v8_message.cc
@@ -29,20 +29,18 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
 
     object_init_ex(return_value, this_ce);
 
-    v8::Isolate *isolate = php_v8_isolate->isolate;
+    PHP_V8_DECLARE_ISOLATE(php_v8_isolate);
     v8::Local<v8::Context> context = isolate->GetEnteredContext();
 
     /* v8::Message::Get */
     if (!message->Get().IsEmpty()) {
-        v8::String::Utf8Value message_utf8(message->Get());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(message_utf8, message_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, message_chars, message->Get());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("message"), message_chars);
     }
 
     /* v8::Message::GetSourceLine */
     if (!message->GetSourceLine(context).IsEmpty()) {
-        v8::String::Utf8Value source_line_utf8(message->GetSourceLine(context).ToLocalChecked());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(source_line_utf8, source_line_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, source_line_chars, message->GetSourceLine(context).ToLocalChecked());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("source_line"), source_line_chars);
     }
 
@@ -54,8 +52,7 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
 
     /* v8::Message::GetScriptResourceName */
     if (!message->GetScriptResourceName().IsEmpty() && !message->GetScriptResourceName()->IsUndefined()) {
-        v8::String::Utf8Value script_resource_name_utf8(message->GetScriptResourceName());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(script_resource_name_utf8, script_resource_name_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, script_resource_name_chars, message->GetScriptResourceName());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("resource_name"), script_resource_name_chars);
     }
 
diff --git a/src/php_v8_object.cc b/src/php_v8_object.cc
@@ -447,7 +447,7 @@ static PHP_METHOD(Object, setAccessor) {
     v8::Local<v8::Object> local_object = php_v8_value_get_local_as<v8::Object>(php_v8_value);
     v8::Local<v8::Name> local_name = php_v8_value_get_local_as<v8::Name>(php_v8_name);
 
-    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(name, local_name);
+    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, name, local_name);
 
     attributes = attributes ? attributes & PHP_V8_PROPERTY_ATTRIBUTE_FLAGS : attributes;
     settings = settings ? settings & PHP_V8_ACCESS_CONTROL_FLAGS : settings;
@@ -574,7 +574,7 @@ static PHP_METHOD(Object, setNativeDataProperty) {
     v8::Local<v8::Object> local_object = php_v8_value_get_local_as<v8::Object>(php_v8_value);
     v8::Local<v8::Name> local_name = php_v8_value_get_local_as<v8::Name>(php_v8_name);
 
-    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(name, local_name);
+    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, name, local_name);
 
     attributes = attributes ? attributes & PHP_V8_PROPERTY_ATTRIBUTE_FLAGS : attributes;
 
diff --git a/src/php_v8_object_template.cc b/src/php_v8_object_template.cc
@@ -245,7 +245,7 @@ static PHP_METHOD(ObjectTemplate, setAccessor) {
 
     v8::Local<v8::Name> local_name = php_v8_value_get_local_as<v8::Name>(php_v8_name);
 
-    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(name, local_name);
+    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, name, local_name);
 
     v8::AccessorNameGetterCallback getter;
     v8::AccessorNameSetterCallback setter = 0;
diff --git a/src/php_v8_script_origin.cc b/src/php_v8_script_origin.cc
@@ -27,11 +27,11 @@ extern void php_v8_create_script_origin(zval *return_value, v8::Local<v8::Contex
     zval options_zv;
 
     object_init_ex(return_value, this_ce);
+    v8::Isolate *isolate= context->GetIsolate();
 
     /* v8::ScriptOrigin::ResourceName */
     if (!origin.ResourceName().IsEmpty() && !origin.ResourceName()->IsUndefined()) {
-        v8::String::Utf8Value resource_name_utf8(origin.ResourceName());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(resource_name_utf8, resource_name_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, resource_name_chars, origin.ResourceName());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("resource_name"), resource_name_chars);
     }
 
@@ -57,8 +57,7 @@ extern void php_v8_create_script_origin(zval *return_value, v8::Local<v8::Contex
 
     /* v8::SourceMapUrl::ResourceName */
     if (!origin.SourceMapUrl().IsEmpty() && !origin.SourceMapUrl()->IsUndefined()) {
-        v8::String::Utf8Value source_map_url_utf8(origin.SourceMapUrl());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(source_map_url_utf8, source_map_url_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, source_map_url_chars, origin.SourceMapUrl());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("source_map_url"), source_map_url_chars);
     }
 }
diff --git a/src/php_v8_stack_frame.cc b/src/php_v8_stack_frame.cc
@@ -22,7 +22,7 @@ zend_class_entry *php_v8_stack_frame_class_entry;
 #define this_ce php_v8_stack_frame_class_entry
 
 
-void php_v8_stack_frame_create_from_stack_frame(zval *return_value, v8::Local<v8::StackFrame> frame) {
+void php_v8_stack_frame_create_from_stack_frame(v8::Isolate *isolate, zval *return_value, v8::Local<v8::StackFrame> frame) {
 
     assert(!frame.IsEmpty());
 
@@ -41,23 +41,19 @@ void php_v8_stack_frame_create_from_stack_frame(zval *return_value, v8::Local<v8
 
     /* v8::StackFrame::GetScriptName */
     if (!frame->GetScriptName().IsEmpty()) {
-        v8::String::Utf8Value script_name_utf8(frame->GetScriptName());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(script_name_utf8, script_name_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, script_name_chars, frame->GetScriptName());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("script_name"), script_name_chars);
     }
 
     /* v8::StackFrame::GetScriptNameOrSourceURL */
     if (!frame->GetScriptNameOrSourceURL().IsEmpty()) {
-        v8::String::Utf8Value script_name_or_source_url_utf8(frame->GetScriptNameOrSourceURL());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(script_name_or_source_url_utf8, script_name_or_source_url_chars);
-        zend_update_property_string(this_ce, return_value, ZEND_STRL("script_name_or_source_url"),
-                                    script_name_or_source_url_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, script_name_or_source_url_chars, frame->GetScriptNameOrSourceURL());
+        zend_update_property_string(this_ce, return_value, ZEND_STRL("script_name_or_source_url"), script_name_or_source_url_chars);
     }
 
     /* v8::StackFrame::GetFunctionName */
     if (!frame->GetFunctionName().IsEmpty()) {
-        v8::String::Utf8Value function_name_utf8(frame->GetFunctionName());
-        PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(function_name_utf8, function_name_chars);
+        PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, function_name_chars, frame->GetFunctionName());
         zend_update_property_string(this_ce, return_value, ZEND_STRL("function_name"), function_name_chars);
     }
 
diff --git a/src/php_v8_stack_frame.h b/src/php_v8_stack_frame.h
@@ -25,7 +25,7 @@ extern "C" {
 
 extern zend_class_entry* php_v8_stack_frame_class_entry;
 
-extern void php_v8_stack_frame_create_from_stack_frame(zval *return_value, v8::Local<v8::StackFrame> frame);
+extern void php_v8_stack_frame_create_from_stack_frame(v8::Isolate *isolate, zval *return_value, v8::Local<v8::StackFrame> frame);
 
 
 PHP_MINIT_FUNCTION(php_v8_stack_frame);
diff --git a/src/php_v8_stack_trace.cc b/src/php_v8_stack_trace.cc
@@ -29,7 +29,7 @@ void php_v8_stack_trace_create_from_stack_trace(zval *return_value, php_v8_isola
 
     object_init_ex(return_value, this_ce);
 
-    v8::Isolate *isolate = php_v8_isolate->isolate;
+    PHP_V8_DECLARE_ISOLATE(php_v8_isolate);
 
     /* v8::StackTrace::GetFrames */
     /* v8::StackTrace::GetFrame */
@@ -42,7 +42,7 @@ void php_v8_stack_trace_create_from_stack_trace(zval *return_value, php_v8_isola
     zval frame_zv;
 
     for (uint32_t i = 0; i < frames_cnt; i++) {
-        php_v8_stack_frame_create_from_stack_frame(&frame_zv, trace->GetFrame(i));
+        php_v8_stack_frame_create_from_stack_frame(isolate, &frame_zv, trace->GetFrame(i));
         add_index_zval(&frames_array_zv, i, &frame_zv);
     }
 
diff --git a/src/php_v8_string.cc b/src/php_v8_string.cc
@@ -59,7 +59,7 @@ static PHP_METHOD(String, value)
 
     v8::Local<v8::Value> str_tpl = php_v8_value_get_local(php_v8_value);
 
-    v8::String::Utf8Value str(str_tpl);
+    v8::String::Utf8Value str(isolate, str_tpl);
 
     PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(str, cstr);
 
diff --git a/src/php_v8_symbol.cc b/src/php_v8_symbol.cc
@@ -69,7 +69,7 @@ static PHP_METHOD(Symbol, value)
         RETURN_EMPTY_STRING();
     }
 
-    v8::String::Utf8Value str(local_name);
+    v8::String::Utf8Value str(isolate, local_name);
 
     PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(str, cstr);
 
diff --git a/src/php_v8_template.cc b/src/php_v8_template.cc
@@ -261,7 +261,7 @@ void php_v8_template_SetNativeDataProperty(v8::Isolate *isolate, v8::Local<T> lo
 
     v8::Local<v8::Name> local_name = php_v8_value_get_local_as<v8::Name>(php_v8_name);
 
-    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(name, local_name);
+    PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, name, local_name);
 
     phpv8::CallbacksBucket *bucket = php_v8_template->persistent_data->bucket("native_data_property_", local_name->IsSymbol(), name);
     data = v8::External::New(isolate, bucket);
diff --git a/src/php_v8_value.h b/src/php_v8_value.h
@@ -87,20 +87,13 @@ extern php_v8_value_t *php_v8_get_or_create_value(zval *return_value, v8::Local<
         return; \
     }
 
-#define PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(cstr, v8_local_string_from) \
-    v8::String::Utf8Value _v8_utf8_str_##cstr((v8_local_string_from)); \
-    PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(_v8_utf8_str_##cstr, cstr); \
+#define PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, cstr, v8_local_string_from)    \
+    v8::String::Utf8Value _v8_utf8_str_##cstr((isolate), (v8_local_string_from));       \
+    PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(_v8_utf8_str_##cstr, cstr);           \
 
-#define PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING_NODECL(cstr, v8_local_string_from) { \
-    v8::String::Utf8Value _v8_utf8_str_##cstr((v8_local_string_from)); \
-    PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK_NODECL(_v8_utf8_str_##cstr, cstr); \
-}
-
-#define PHP_V8_SET_ZVAL_STRING_FROM_V8_STRING(zval_to, v8_local_string_from) { \
-    v8::String::Utf8Value _v8_utf8_str((v8_local_string_from)); \
-    PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(_v8_utf8_str, _v8_utf8_cstr); \
-    ZVAL_STRINGL((zval_to), _v8_utf8_cstr, _v8_utf8_str.length()); \
-}
+#define PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING_NODECL(isolate, cstr, v8_local_string_from) \
+    v8::String::Utf8Value _v8_utf8_str_##cstr((isolate), (v8_local_string_from));           \
+    PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK_NODECL(_v8_utf8_str_##cstr, cstr);        \
 
 struct _php_v8_value_t {
     php_v8_isolate_t *php_v8_isolate;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ int main(int argc, char* argv[]) {`
`78`	`78`	`Local<Value> result = script->Run();`
`79`	`79`
`80`	`80`	`// Convert the result to an UTF8 string and print it.`
`81`		`- String::Utf8Value utf8(result);`
	`81`	`+ String::Utf8Value utf8(isolate, result);`
`82`	`82`	`printf("%s\n", *utf8);`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ extern void php_v8_create_script_origin(zval *return_value, v8::Local<v8::Contex`
`27`	`27`	`zval options_zv;`
`28`	`28`
`29`	`29`	`object_init_ex(return_value, this_ce);`
	`30`	`+ v8::Isolate *isolate= context->GetIsolate();`
`30`	`31`
`31`	`32`	`/* v8::ScriptOrigin::ResourceName */`
`32`	`33`	`if (!origin.ResourceName().IsEmpty() && !origin.ResourceName()->IsUndefined()) {`
`33`		`- v8::String::Utf8Value resource_name_utf8(origin.ResourceName());`
`34`		`- PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(resource_name_utf8, resource_name_chars);`
	`34`	`+ PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, resource_name_chars, origin.ResourceName());`
`35`	`35`	`zend_update_property_string(this_ce, return_value, ZEND_STRL("resource_name"), resource_name_chars);`
`36`	`36`	`}`
`37`	`37`
`@@ -57,8 +57,7 @@ extern void php_v8_create_script_origin(zval *return_value, v8::Local<v8::Contex`
`57`	`57`
`58`	`58`	`/* v8::SourceMapUrl::ResourceName */`
`59`	`59`	`if (!origin.SourceMapUrl().IsEmpty() && !origin.SourceMapUrl()->IsUndefined()) {`
`60`		`- v8::String::Utf8Value source_map_url_utf8(origin.SourceMapUrl());`
`61`		`- PHP_V8_CONVERT_UTF8VALUE_TO_STRING_WITH_CHECK(source_map_url_utf8, source_map_url_chars);`
	`60`	`+ PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(isolate, source_map_url_chars, origin.SourceMapUrl());`
`62`	`61`	`zend_update_property_string(this_ce, return_value, ZEND_STRL("source_map_url"), source_map_url_chars);`
`63`	`62`	`}`
`64`	`63`	`}`