Remove this_ptr and use ZVAL_OBJ() when needed

pinepain · pinepain · commit 2296bb249f77 · 2017-02-25T23:54:55.000+02:00
diff --git a/src/php_v8_array.cc b/src/php_v8_array.cc
@@ -43,7 +43,6 @@ static PHP_METHOD(V8Array, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_array, "Failed to create Array value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_array);
 
     php_v8_value->persistent->Reset(isolate, local_array);
diff --git a/src/php_v8_boolean_object.cc b/src/php_v8_boolean_object.cc
@@ -38,7 +38,6 @@ static PHP_METHOD(V8BooleanObject, __construct) {
 
     v8::Local<v8::BooleanObject> local_bool_obj = v8::BooleanObject::New(isolate, value).As<v8::BooleanObject>();
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_bool_obj);
 
     php_v8_value->persistent->Reset(isolate, local_bool_obj);
diff --git a/src/php_v8_callback_info.cc b/src/php_v8_callback_info.cc
@@ -130,7 +130,8 @@ static PHP_METHOD(V8CallbackInfo, GetIsolate) {
     PHP_V8_CALLBACK_INFO_FETCH_WITH_CHECK(getThis(), php_v8_callback_info);
     PHP_V8_V8_CALLBACK_INFO_CHECK_IN_CONTEXT(php_v8_callback_info);
 
-    RETVAL_ZVAL(&php_v8_callback_info->php_v8_isolate->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_callback_info->php_v8_isolate->std);
+    Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8CallbackInfo, GetContext) {
@@ -141,7 +142,8 @@ static PHP_METHOD(V8CallbackInfo, GetContext) {
     PHP_V8_CALLBACK_INFO_FETCH_WITH_CHECK(getThis(), php_v8_callback_info);
     PHP_V8_V8_CALLBACK_INFO_CHECK_IN_CONTEXT(php_v8_callback_info);
 
-    RETVAL_ZVAL(&php_v8_callback_info->php_v8_context->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_callback_info->php_v8_context->std);
+    Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8CallbackInfo, This) {
diff --git a/src/php_v8_callbacks.cc b/src/php_v8_callbacks.cc
@@ -537,6 +537,7 @@ bool php_v8_callback_access_check(v8::Local<v8::Context> accessing_context, v8::
     zval args;
     zval accessed_object_zv;
     zval retval;
+    zval context_zv;
 
     bool security_retval = false;
 
@@ -550,7 +551,8 @@ bool php_v8_callback_access_check(v8::Local<v8::Context> accessing_context, v8::
 
     php_v8_get_or_create_value(&accessed_object_zv, accessed_object, php_v8_isolate);
 
-    add_index_zval(&args, 0, &php_v8_context->this_ptr);
+    ZVAL_OBJ(&context_zv, &php_v8_context->std);
+    add_index_zval(&args, 0, &context_zv);
     add_index_zval(&args, 1, &accessed_object_zv);
 
     php_v8_callback_call_from_bucket_with_zargs(0, data, &args, &retval);
diff --git a/src/php_v8_context.cc b/src/php_v8_context.cc
@@ -40,10 +40,6 @@ static void php_v8_context_free(zend_object *object)
         delete php_v8_context->context;
     }
 
-    if (!Z_ISUNDEF(php_v8_context->this_ptr)) {
-        zval_ptr_dtor(&php_v8_context->this_ptr);
-    }
-
     zend_object_std_dtor(&php_v8_context->std);
 }
 
@@ -122,7 +118,6 @@ static PHP_METHOD(V8Context, __construct)
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(context, "Failed to create Context");
 
-    ZVAL_COPY_VALUE(&php_v8_context->this_ptr, getThis());
     php_v8_context_store_reference(isolate, context, php_v8_context);
 
     php_v8_context->context->Reset(isolate, context);
diff --git a/src/php_v8_context.h b/src/php_v8_context.h
@@ -72,7 +72,7 @@ struct _php_v8_context_t {
     v8::Persistent<v8::Context> *context;
 
     uint32_t isolate_handle;
-    zval this_ptr;
+
     zend_object std;
 };
 
diff --git a/src/php_v8_date.cc b/src/php_v8_date.cc
@@ -42,7 +42,6 @@ static PHP_METHOD(V8Date, __construct) {
 
     v8::Local<v8::Date> local_date = maybe_local_date.ToLocalChecked().As<v8::Date>();
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_date);
 
     php_v8_value->persistent->Reset(isolate, local_date);
diff --git a/src/php_v8_exceptions.cc b/src/php_v8_exceptions.cc
@@ -58,6 +58,9 @@ void php_v8_throw_try_catch_exception(php_v8_context_t *php_v8_context, v8::TryC
 
 void php_v8_create_try_catch_exception(zval *return_value, php_v8_isolate_t *php_v8_isolate, php_v8_context_t *php_v8_context, v8::TryCatch *try_catch)
 {
+    zval isolate_zv;
+    zval context_zv;
+
     zval try_catch_zv;
     zend_class_entry* ce = NULL;
     const char *message = NULL;
@@ -88,8 +91,11 @@ void php_v8_create_try_catch_exception(zval *return_value, php_v8_isolate_t *php
         zend_update_property_string(php_v8_try_catch_exception_class_entry, return_value, ZEND_STRL("message"), message);
     }
 
-    PHP_V8_TRY_CATCH_EXCEPTION_STORE_ISOLATE(return_value, &php_v8_isolate->this_ptr);
-    PHP_V8_TRY_CATCH_EXCEPTION_STORE_CONTEXT(return_value, &php_v8_context->this_ptr);
+    ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
+    ZVAL_OBJ(&context_zv, &php_v8_context->std);
+
+    PHP_V8_TRY_CATCH_EXCEPTION_STORE_ISOLATE(return_value, &isolate_zv);
+    PHP_V8_TRY_CATCH_EXCEPTION_STORE_CONTEXT(return_value, &context_zv);
 
     php_v8_try_catch_create_from_try_catch(&try_catch_zv, php_v8_isolate, php_v8_context, try_catch);
     PHP_V8_TRY_CATCH_EXCEPTION_STORE_TRY_CATCH(return_value, &try_catch_zv);
diff --git a/src/php_v8_function.cc b/src/php_v8_function.cc
@@ -349,7 +349,6 @@ static PHP_METHOD(V8Function, __construct) {
 
     v8::Local<v8::Function> local_function = maybe_local_function.ToLocalChecked();
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_function);
 
     php_v8_value->persistent->Reset(isolate, local_function);
diff --git a/src/php_v8_isolate.cc b/src/php_v8_isolate.cc
@@ -109,10 +109,6 @@ static void php_v8_isolate_free(zend_object *object) {
         delete php_v8_isolate->weak_values;
     }
 
-    if (!Z_ISUNDEF(php_v8_isolate->this_ptr)) {
-        zval_ptr_dtor(&php_v8_isolate->this_ptr);
-    }
-
     if (php_v8_isolate->gc_data) {
         efree(php_v8_isolate->gc_data);
     }
@@ -208,7 +204,6 @@ static PHP_METHOD(V8Isolate, __construct) {
     php_v8_isolate->isolate = v8::Isolate::New(*php_v8_isolate->create_params);
     PHP_V8_ISOLATE_STORE_REFERENCE(php_v8_isolate);
 
-    ZVAL_COPY_VALUE(&php_v8_isolate->this_ptr, getThis());
     php_v8_isolate->isolate_handle = Z_OBJ_HANDLE_P(getThis());
 
     php_v8_isolate->isolate->SetFatalErrorHandler(php_v8_fatal_error_handler);
@@ -379,7 +374,8 @@ static PHP_METHOD(V8Isolate, GetCurrentContext) {
 
     php_v8_context_t *php_v8_context = php_v8_context_get_reference(local_context);
 
-    RETURN_ZVAL(&php_v8_context->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_context->std);
+    Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8Isolate, ThrowException) {
diff --git a/src/php_v8_isolate.h b/src/php_v8_isolate.h
@@ -133,7 +133,6 @@ struct _php_v8_isolate_t {
     zval *gc_data;
     int   gc_data_count;
 
-    zval this_ptr;
     zend_object std;
 };
 
diff --git a/src/php_v8_isolate_limits.cc b/src/php_v8_isolate_limits.cc
@@ -183,12 +183,16 @@ void php_v8_isolate_limits_ctor(php_v8_isolate_t *php_v8_isolate) {
 }
 
 void php_v8_isolate_maybe_update_limits_hit(php_v8_isolate_t *php_v8_isolate) {
+    zval isolate_zv;
+
+    ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
     PHP_V8_DECLARE_LIMITS(php_v8_isolate);
+
     if (limits->time_limit) {
-        zend_update_property_bool(php_v8_isolate_class_entry, &php_v8_isolate->this_ptr, ZEND_STRL("time_limit_hit"), limits->time_limit_hit);
+        zend_update_property_bool(php_v8_isolate_class_entry, &isolate_zv, ZEND_STRL("time_limit_hit"), limits->time_limit_hit);
     }
     if (limits->memory_limit) {
-        zend_update_property_bool(php_v8_isolate_class_entry, &php_v8_isolate->this_ptr, ZEND_STRL("memory_limit_hit"), limits->memory_limit_hit);
+        zend_update_property_bool(php_v8_isolate_class_entry, &isolate_zv, ZEND_STRL("memory_limit_hit"), limits->memory_limit_hit);
     }
 }
 
diff --git a/src/php_v8_map.cc b/src/php_v8_map.cc
@@ -38,7 +38,6 @@ static PHP_METHOD(V8Map, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_map, "Failed to create Map value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_map);
 
     php_v8_value->persistent->Reset(isolate, local_map);
@@ -137,7 +136,7 @@ static PHP_METHOD(V8Map, Set) {
     PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
     PHP_V8_THROW_EXCEPTION_WHEN_EMPTY(maybe_local_res, "Failed to set");
 
-    RETVAL_ZVAL(&php_v8_value->this_ptr, 1, 0);
+    ZVAL_COPY(return_value, getThis());
 }
 
 
diff --git a/src/php_v8_number_object.cc b/src/php_v8_number_object.cc
@@ -40,7 +40,6 @@ static PHP_METHOD(V8NumberObject, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_number_obj, "Failed to create NumberObject value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_number_obj);
 
     php_v8_value->persistent->Reset(isolate, local_number_obj);
diff --git a/src/php_v8_object.cc b/src/php_v8_object.cc
@@ -113,7 +113,6 @@ static PHP_METHOD(V8Object, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_object, "Failed to create Object value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_object);
 
     php_v8_value->persistent->Reset(isolate, local_object);
@@ -1087,7 +1086,8 @@ static PHP_METHOD(V8Object, CreationContext) {
 
     php_v8_context_t *php_v8_context = php_v8_context_get_reference(local_context);
 
-    RETVAL_ZVAL(&php_v8_context->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_context->std);
+    Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8Object, IsCallable) {
diff --git a/src/php_v8_regexp.cc b/src/php_v8_regexp.cc
@@ -51,7 +51,6 @@ static PHP_METHOD(V8RegExp, __construct) {
 
     v8::Local<v8::RegExp> local_regexp = maybe_local_regexp.ToLocalChecked();
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_regexp);
 
     php_v8_value->persistent->Reset(isolate, local_regexp);
diff --git a/src/php_v8_return_value.cc b/src/php_v8_return_value.cc
@@ -354,7 +354,8 @@ static PHP_METHOD(V8ReturnValue, GetIsolate) {
     PHP_V8_FETCH_RETURN_VALUE_WITH_CHECK(getThis(), php_v8_return_value);
     PHP_V8_RETURN_VALUE_CHECK_IN_CONTEXT(php_v8_return_value);
 
-    RETVAL_ZVAL(&php_v8_return_value->php_v8_isolate->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_return_value->php_v8_isolate->std);
+    Z_ADDREF_P(return_value);
 }
 
 // Convenience getter for Context
@@ -366,7 +367,8 @@ static PHP_METHOD(V8ReturnValue, GetContext) {
     PHP_V8_FETCH_RETURN_VALUE_WITH_CHECK(getThis(), php_v8_return_value);
     PHP_V8_RETURN_VALUE_CHECK_IN_CONTEXT(php_v8_return_value);
 
-    RETVAL_ZVAL(&php_v8_return_value->php_v8_context->this_ptr, 1, 0);
+    ZVAL_OBJ(return_value, &php_v8_return_value->php_v8_context->std);
+    Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8ReturnValue, InContext) {
diff --git a/src/php_v8_set.cc b/src/php_v8_set.cc
@@ -38,7 +38,6 @@ static PHP_METHOD(V8Set, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_set, "Failed to create Map value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_set);
 
     php_v8_value->persistent->Reset(isolate, local_set);
@@ -97,7 +96,7 @@ static PHP_METHOD(V8Set, Add) {
     PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
     PHP_V8_THROW_EXCEPTION_WHEN_EMPTY(maybe_local_res, "Failed to add");
 
-    RETVAL_ZVAL(&php_v8_value->this_ptr, 1, 0);
+    ZVAL_COPY(return_value, getThis());
 }
 
 static PHP_METHOD(V8Set, Has) {
diff --git a/src/php_v8_string_object.cc b/src/php_v8_string_object.cc
@@ -43,7 +43,6 @@ static PHP_METHOD(V8StringObject, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_string_obj, "Failed to create StringObject value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_string_obj);
 
     php_v8_value->persistent->Reset(isolate, local_string_obj);
diff --git a/src/php_v8_symbol_object.cc b/src/php_v8_symbol_object.cc
@@ -43,7 +43,6 @@ static PHP_METHOD(V8SymbolObject, __construct) {
 
     PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_symbol_obj, "Failed to create SymbolObject value");
 
-    ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(php_v8_value, local_symbol_obj);
 
     php_v8_value->persistent->Reset(isolate, local_symbol_obj);
diff --git a/src/php_v8_try_catch.cc b/src/php_v8_try_catch.cc
@@ -24,13 +24,19 @@ zend_class_entry* php_v8_try_catch_class_entry;
 
 
 void php_v8_try_catch_create_from_try_catch(zval *return_value, php_v8_isolate_t *php_v8_isolate, php_v8_context_t *php_v8_context, v8::TryCatch *try_catch) {
+    zval isolate_zv;
+    zval context_zv;
+
     object_init_ex(return_value, this_ce);
 
     PHP_V8_DECLARE_ISOLATE(php_v8_isolate);
     v8::Local<v8::Context> context = isolate->GetCurrentContext();
 
-    zend_update_property(this_ce, return_value, ZEND_STRL("isolate"), &php_v8_isolate->this_ptr);
-    zend_update_property(this_ce, return_value, ZEND_STRL("context"), &php_v8_context->this_ptr);
+    ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
+    ZVAL_OBJ(&context_zv, &php_v8_context->std);
+
+    zend_update_property(this_ce, return_value, ZEND_STRL("isolate"), &isolate_zv);
+    zend_update_property(this_ce, return_value, ZEND_STRL("context"), &context_zv);
 
     zend_update_property_bool(this_ce, return_value, ZEND_STRL("can_continue"), static_cast<zend_long>(try_catch && try_catch->CanContinue()));
     zend_update_property_bool(this_ce, return_value, ZEND_STRL("has_terminated"), static_cast<zend_long>(try_catch && try_catch->HasTerminated()));
diff --git a/src/php_v8_unbound_script.cc b/src/php_v8_unbound_script.cc
@@ -28,12 +28,15 @@ static zend_object_handlers php_v8_unbound_script_object_handlers;
 
 
 php_v8_unbound_script_t * php_v8_create_unbound_script(zval *return_value, php_v8_isolate_t *php_v8_isolate, v8::Local<v8::UnboundScript> unbound_script) {
+    zval isolate_zv;
     assert(!unbound_script.IsEmpty());
 
     object_init_ex(return_value, this_ce);
 
+    ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
+
     PHP_V8_FETCH_UNBOUND_SCRIPT_INTO(return_value, php_v8_unbound_script);
-    PHP_V8_UNBOUND_SCRIPT_STORE_ISOLATE(return_value, &php_v8_isolate->this_ptr)
+    PHP_V8_UNBOUND_SCRIPT_STORE_ISOLATE(return_value, &isolate_zv)
     PHP_V8_STORE_POINTER_TO_ISOLATE(php_v8_unbound_script, php_v8_isolate);
 
     php_v8_unbound_script->persistent->Reset(php_v8_isolate->isolate, unbound_script);
diff --git a/src/php_v8_value.cc b/src/php_v8_value.cc
@@ -113,10 +113,6 @@ static void php_v8_value_free(zend_object *object) {
         }
     }
 
-    if (!Z_ISUNDEF(php_v8_value->this_ptr)) {
-        zval_ptr_dtor(&php_v8_value->this_ptr);
-    }
-
     if (php_v8_value->gc_data) {
         efree(php_v8_value->gc_data);
     }
@@ -270,22 +266,26 @@ zend_class_entry *php_v8_get_class_entry_from_value(v8::Local<v8::Value> value)
 }
 
 php_v8_value_t *php_v8_create_value(zval *return_value, v8::Local<v8::Value> local_value, php_v8_isolate_t *php_v8_isolate) {
+    zval isolate_zv;
+    zval context_zv;
     assert(!local_value.IsEmpty());
 
     object_init_ex(return_value, php_v8_get_class_entry_from_value(local_value));
     PHP_V8_VALUE_FETCH_INTO(return_value, return_php_v8_value);
-    PHP_V8_VALUE_STORE_ISOLATE(return_value, &php_v8_isolate->this_ptr);
+
+    ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
+    PHP_V8_VALUE_STORE_ISOLATE(return_value, &isolate_zv);
     PHP_V8_STORE_POINTER_TO_ISOLATE(return_php_v8_value, php_v8_isolate);
 
     if (local_value->IsObject()) {
         assert(php_v8_isolate->isolate->InContext());
 
         php_v8_context_t *php_v8_context = php_v8_context_get_reference(local_value.As<v8::Object>()->CreationContext());
 
-        PHP_V8_OBJECT_STORE_CONTEXT(return_value, &php_v8_context->this_ptr);
+        ZVAL_OBJ(&context_zv, &php_v8_context->std);
+        PHP_V8_OBJECT_STORE_CONTEXT(return_value, &context_zv);
         PHP_V8_STORE_POINTER_TO_CONTEXT(return_php_v8_value, php_v8_context);
 
-        ZVAL_COPY_VALUE(&return_php_v8_value->this_ptr, return_value);
         php_v8_object_store_self_ptr(return_php_v8_value, v8::Local<v8::Object>::Cast(local_value));
     }
 
@@ -303,7 +303,8 @@ php_v8_value_t *php_v8_get_or_create_value(zval *return_value, v8::Local<v8::Val
         php_v8_value_t *data = php_v8_object_get_self_ptr(php_v8_isolate, v8::Local<v8::Object>::Cast(local_value));
 
         if (data) {
-            ZVAL_ZVAL(return_value, &data->this_ptr, 1, 0);
+            ZVAL_OBJ(return_value, &data->std);
+            Z_ADDREF_P(return_value);
             return data;
         }
     }
diff --git a/src/php_v8_value.h b/src/php_v8_value.h
@@ -117,7 +117,6 @@ struct _php_v8_value_t {
     zval *gc_data;
     int   gc_data_count;
 
-    zval this_ptr; // makes sense for objects only
     zend_object std;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,6 @@ static void php_v8_context_free(zend_object *object)`
`40`	`40`	`delete php_v8_context->context;`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (!Z_ISUNDEF(php_v8_context->this_ptr)) {`
`44`		`- zval_ptr_dtor(&php_v8_context->this_ptr);`
`45`		`- }`
`46`		`-`
`47`	`43`	`zend_object_std_dtor(&php_v8_context->std);`
`48`	`44`	`}`
`49`	`45`
`@@ -122,7 +118,6 @@ static PHP_METHOD(V8Context, __construct)`
`122`	`118`
`123`	`119`	`PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(context, "Failed to create Context");`
`124`	`120`
`125`		`- ZVAL_COPY_VALUE(&php_v8_context->this_ptr, getThis());`
`126`	`121`	`php_v8_context_store_reference(isolate, context, php_v8_context);`
`127`	`122`
`128`	`123`	`php_v8_context->context->Reset(isolate, context);`