Inline internal object fetching

pinepain · pinepain · commit a789ca7bfa51 · 2017-02-20T07:30:44.000+02:00
diff --git a/src/php_v8_cached_data.cc b/src/php_v8_cached_data.cc
@@ -24,9 +24,6 @@ zend_class_entry * php_v8_cached_data_class_entry;
 
 static zend_object_handlers php_v8_cached_data_object_handlers;
 
-php_v8_cached_data_t * php_v8_cached_data_fetch_object(zend_object *obj) {
-    return (php_v8_cached_data_t *)((char *)obj - XtOffsetOf(php_v8_cached_data_t, std));
-}
 
 php_v8_cached_data_t * php_v8_create_cached_data(zval *return_value, const v8::ScriptCompiler::CachedData *cached_data) {
 
diff --git a/src/php_v8_cached_data.h b/src/php_v8_cached_data.h
@@ -28,7 +28,7 @@ extern "C" {
 
 extern zend_class_entry *php_v8_cached_data_class_entry;
 
-extern php_v8_cached_data_t * php_v8_cached_data_fetch_object(zend_object *obj);
+inline php_v8_cached_data_t * php_v8_cached_data_fetch_object(zend_object *obj);
 extern php_v8_cached_data_t * php_v8_create_cached_data(zval *return_value, const v8::ScriptCompiler::CachedData *cached_data);
 
 
@@ -57,6 +57,10 @@ struct _php_v8_cached_data_t {
   zend_object std;
 };
 
+inline php_v8_cached_data_t * php_v8_cached_data_fetch_object(zend_object *obj) {
+    return (php_v8_cached_data_t *)((char *)obj - XtOffsetOf(php_v8_cached_data_t, std));
+}
+
 PHP_MINIT_FUNCTION(php_v8_cached_data);
 
 #endif //PHP_V8_CACHED_DATA_H
diff --git a/src/php_v8_callback_info.cc b/src/php_v8_callback_info.cc
@@ -25,9 +25,6 @@ zend_class_entry *php_v8_callback_info_class_entry;
 
 static zend_object_handlers php_v8_callback_info_object_handlers;
 
-php_v8_callback_info_t * php_v8_callback_info_fetch_object(zend_object *obj) {
-    return (php_v8_callback_info_t *)((char *)obj - XtOffsetOf(php_v8_callback_info_t, std));
-}
 
 void php_v8_callback_info_invalidate(php_v8_callback_info_t *php_v8_callback_info) {
     if (php_v8_callback_info->php_v8_return_value) {
diff --git a/src/php_v8_callback_info.h b/src/php_v8_callback_info.h
@@ -32,7 +32,7 @@ extern "C" {
 extern zend_class_entry* php_v8_callback_info_class_entry;
 
 
-extern php_v8_callback_info_t * php_v8_callback_info_fetch_object(zend_object *obj);
+inline php_v8_callback_info_t * php_v8_callback_info_fetch_object(zend_object *obj);
 extern void php_v8_callback_info_invalidate(php_v8_callback_info_t *php_v8_callback_info);
 
 #define PHP_V8_CALLBACK_INFO_FETCH(zv) php_v8_callback_info_fetch_object(Z_OBJ_P(zv))
@@ -77,6 +77,10 @@ struct _php_v8_callback_info_t {
     zend_object std;
 };
 
+inline php_v8_callback_info_t * php_v8_callback_info_fetch_object(zend_object *obj) {
+    return (php_v8_callback_info_t *)((char *)obj - XtOffsetOf(php_v8_callback_info_t, std));
+}
+
 PHP_MINIT_FUNCTION(php_v8_callback_info);
 
 #endif //PHP_V8_CALLBACK_INFO_H
diff --git a/src/php_v8_context.cc b/src/php_v8_context.cc
@@ -26,10 +26,6 @@ zend_class_entry* php_v8_context_class_entry;
 static zend_object_handlers php_v8_context_object_handlers;
 
 
-php_v8_context_t * php_v8_context_fetch_object(zend_object *obj) {
-    return (php_v8_context_t *)((char *)obj - XtOffsetOf(php_v8_context_t, std));
-}
-
 static void php_v8_context_free(zend_object *object)
 {
     php_v8_context_t *php_v8_context = php_v8_context_fetch_object(object);
diff --git a/src/php_v8_context.h b/src/php_v8_context.h
@@ -28,10 +28,9 @@ extern "C" {
 
 extern zend_class_entry *php_v8_context_class_entry;
 
-extern php_v8_context_t *php_v8_context_fetch_object(zend_object *obj);
+inline php_v8_context_t *php_v8_context_fetch_object(zend_object *obj);
 
 extern void php_v8_context_store_reference(v8::Isolate *isolate, v8::Local<v8::Context> context, php_v8_context_t *php_v8_context);
-
 extern php_v8_context_t *php_v8_context_get_reference(v8::Local<v8::Context> context);
 
 
@@ -77,6 +76,9 @@ struct _php_v8_context_t {
     zend_object std;
 };
 
+inline php_v8_context_t * php_v8_context_fetch_object(zend_object *obj) {
+    return (php_v8_context_t *)((char *)obj - XtOffsetOf(php_v8_context_t, std));
+}
 
 PHP_MINIT_FUNCTION(php_v8_context);
 
diff --git a/src/php_v8_function_template.cc b/src/php_v8_function_template.cc
@@ -30,10 +30,6 @@ zend_class_entry *php_v8_function_template_class_entry;
 static zend_object_handlers php_v8_function_template_object_handlers;
 
 
-php_v8_function_template_t * php_v8_function_template_fetch_object(zend_object *obj) {
-    return (php_v8_function_template_t *)((char *)obj - XtOffsetOf(php_v8_function_template_t, std));
-}
-
 static void php_v8_function_template_weak_callback(const v8::WeakCallbackInfo<v8::Persistent<v8::FunctionTemplate>> &data) {
     v8::Isolate *isolate = data.GetIsolate();
     php_v8_isolate_t *php_v8_isolate = PHP_V8_ISOLATE_FETCH_REFERENCE(isolate);
diff --git a/src/php_v8_function_template.h b/src/php_v8_function_template.h
@@ -32,8 +32,7 @@ extern zend_class_entry* php_v8_function_template_class_entry;
 typedef struct _php_v8_function_template_t php_v8_function_template_t;
 
 
-extern php_v8_function_template_t * php_v8_function_template_fetch_object(zend_object *obj);
-
+inline php_v8_function_template_t * php_v8_function_template_fetch_object(zend_object *obj);
 
 #define PHP_V8_FUNCTION_TEMPLATE_FETCH(zv) php_v8_function_template_fetch_object(Z_OBJ_P(zv))
 #define PHP_V8_FUNCTION_TEMPLATE_FETCH_INTO(pzval, into) php_v8_function_template_t *(into) = PHP_V8_FUNCTION_TEMPLATE_FETCH((pzval));
@@ -64,6 +63,10 @@ struct _php_v8_function_template_t {
     zend_object std;
 };
 
+inline php_v8_function_template_t * php_v8_function_template_fetch_object(zend_object *obj) {
+    return (php_v8_function_template_t *)((char *)obj - XtOffsetOf(php_v8_function_template_t, std));
+}
+
 inline v8::Local<v8::FunctionTemplate> php_v8_function_template_get_local(php_v8_function_template_t *php_v8_function_template) {
     return v8::Local<v8::FunctionTemplate>::New(php_v8_function_template->php_v8_isolate->isolate, *php_v8_function_template->persistent);
 }
diff --git a/src/php_v8_indexed_property_handler_configuration.cc b/src/php_v8_indexed_property_handler_configuration.cc
@@ -24,9 +24,6 @@ zend_class_entry* php_v8_indexed_property_handler_configuration_class_entry;
 
 static zend_object_handlers php_v8_indexed_property_handler_configuration_object_handlers;
 
-php_v8_indexed_property_handler_configuration_t * php_v8_indexed_property_handler_configuration_fetch_object(zend_object *obj) {
-    return (php_v8_indexed_property_handler_configuration_t *)((char *)obj - XtOffsetOf(php_v8_indexed_property_handler_configuration_t, std));
-}
 
 static HashTable * php_v8_indexed_property_handler_configuration_gc(zval *object, zval **table, int *n) {
     PHP_V8_INDEXED_PROPERTY_HANDLER_FETCH_INTO(object, php_v8_handlers);
diff --git a/src/php_v8_indexed_property_handler_configuration.h b/src/php_v8_indexed_property_handler_configuration.h
@@ -27,7 +27,7 @@ extern "C" {
 extern zend_class_entry* php_v8_indexed_property_handler_configuration_class_entry;
 typedef struct _php_v8_indexed_property_handler_configuration_t php_v8_indexed_property_handler_configuration_t;
 
-extern php_v8_indexed_property_handler_configuration_t * php_v8_indexed_property_handler_configuration_fetch_object(zend_object *obj);
+inline php_v8_indexed_property_handler_configuration_t * php_v8_indexed_property_handler_configuration_fetch_object(zend_object *obj);
 
 #define PHP_V8_INDEXED_PROPERTY_HANDLER_FETCH(zv) php_v8_indexed_property_handler_configuration_fetch_object(Z_OBJ_P(zv))
 #define PHP_V8_INDEXED_PROPERTY_HANDLER_FETCH_INTO(pzval, into) php_v8_indexed_property_handler_configuration_t *(into) = PHP_V8_INDEXED_PROPERTY_HANDLER_FETCH((pzval));
@@ -62,6 +62,10 @@ typedef struct _php_v8_indexed_property_handler_configuration_t {
     zend_object std;
 } php_v8_indexed_property_handler_configuration_t;
 
+inline php_v8_indexed_property_handler_configuration_t * php_v8_indexed_property_handler_configuration_fetch_object(zend_object *obj) {
+    return (php_v8_indexed_property_handler_configuration_t *)((char *)obj - XtOffsetOf(php_v8_indexed_property_handler_configuration_t, std));
+}
+
 
 PHP_MINIT_FUNCTION(php_v8_indexed_property_handler_configuration);
 
diff --git a/src/php_v8_isolate.cc b/src/php_v8_isolate.cc
@@ -34,9 +34,6 @@ zend_class_entry *php_v8_isolate_class_entry;
 
 static zend_object_handlers php_v8_isolate_object_handlers;
 
-php_v8_isolate_t *php_v8_isolate_fetch_object(zend_object *obj) {
-    return (php_v8_isolate_t *) ((char *) obj - XtOffsetOf(php_v8_isolate_t, std));
-}
 
 static void php_v8_maybe_terminate_execution(php_v8_isolate_t *php_v8_isolate) {
     if (php_v8_isolate->isolate->IsExecutionTerminating()) {
diff --git a/src/php_v8_isolate.h b/src/php_v8_isolate.h
@@ -31,7 +31,8 @@ extern "C" {
 
 extern zend_class_entry *php_v8_isolate_class_entry;
 
-extern php_v8_isolate_t * php_v8_isolate_fetch_object(zend_object *obj);
+inline php_v8_isolate_t * php_v8_isolate_fetch_object(zend_object *obj);
+inline v8::Local<v8::Private> php_v8_isolate_get_key_local(php_v8_isolate_t *php_v8_isolate);
 
 // TODO: remove or cleanup to use for debug reasons
 #define SX(x) #x
@@ -136,6 +137,10 @@ struct _php_v8_isolate_t {
     zend_object std;
 };
 
+inline php_v8_isolate_t *php_v8_isolate_fetch_object(zend_object *obj) {
+    return (php_v8_isolate_t *) ((char *) obj - XtOffsetOf(php_v8_isolate_t, std));
+}
+
 inline v8::Local<v8::Private> php_v8_isolate_get_key_local(php_v8_isolate_t *php_v8_isolate) {
     return v8::Local<v8::Private>::New(php_v8_isolate->isolate, php_v8_isolate->key);
 }
diff --git a/src/php_v8_named_property_handler_configuration.cc b/src/php_v8_named_property_handler_configuration.cc
@@ -23,9 +23,6 @@ zend_class_entry* php_v8_named_property_handler_configuration_class_entry;
 
 static zend_object_handlers php_v8_named_property_handler_configuration_object_handlers;
 
-php_v8_named_property_handler_configuration_t * php_v8_named_property_handler_configuration_fetch_object(zend_object *obj) {
-    return (php_v8_named_property_handler_configuration_t *)((char *)obj - XtOffsetOf(php_v8_named_property_handler_configuration_t, std));
-}
 
 static HashTable * php_v8_named_property_handler_configuration_gc(zval *object, zval **table, int *n) {
     PHP_V8_NAMED_PROPERTY_HANDLER_FETCH_INTO(object, php_v8_handlers);
diff --git a/src/php_v8_named_property_handler_configuration.h b/src/php_v8_named_property_handler_configuration.h
@@ -28,7 +28,7 @@ extern "C" {
 
 extern zend_class_entry* php_v8_named_property_handler_configuration_class_entry;
 
-extern php_v8_named_property_handler_configuration_t * php_v8_named_property_handler_configuration_fetch_object(zend_object *obj);
+inline php_v8_named_property_handler_configuration_t * php_v8_named_property_handler_configuration_fetch_object(zend_object *obj);
 
 #define PHP_V8_NAMED_PROPERTY_HANDLER_FETCH(zv) php_v8_named_property_handler_configuration_fetch_object(Z_OBJ_P(zv))
 #define PHP_V8_NAMED_PROPERTY_HANDLER_FETCH_INTO(pzval, into) php_v8_named_property_handler_configuration_t *(into) = PHP_V8_NAMED_PROPERTY_HANDLER_FETCH((pzval));
@@ -64,6 +64,10 @@ typedef struct _php_v8_named_property_handler_configuration_t {
   zend_object std;
 } php_v8_named_property_handler_configuration_t;
 
+inline php_v8_named_property_handler_configuration_t * php_v8_named_property_handler_configuration_fetch_object(zend_object *obj) {
+    return (php_v8_named_property_handler_configuration_t *)((char *)obj - XtOffsetOf(php_v8_named_property_handler_configuration_t, std));
+}
+
 
 PHP_MINIT_FUNCTION(php_v8_named_property_handler_configuration);
 
diff --git a/src/php_v8_object_template.cc b/src/php_v8_object_template.cc
@@ -32,10 +32,6 @@ zend_class_entry *php_v8_object_template_class_entry;
 static zend_object_handlers php_v8_object_template_object_handlers;
 
 
-php_v8_object_template_t * php_v8_object_template_fetch_object(zend_object *obj) {
-    return (php_v8_object_template_t *)((char *)obj - XtOffsetOf(php_v8_object_template_t, std));
-}
-
 static void php_v8_object_template_weak_callback(const v8::WeakCallbackInfo<v8::Persistent<v8::ObjectTemplate>> &data) {
     v8::Isolate *isolate = data.GetIsolate();
     php_v8_isolate_t *php_v8_isolate = PHP_V8_ISOLATE_FETCH_REFERENCE(isolate);
diff --git a/src/php_v8_object_template.h b/src/php_v8_object_template.h
@@ -32,7 +32,7 @@ extern "C" {
 extern zend_class_entry* php_v8_object_template_class_entry;
 
 
-extern php_v8_object_template_t * php_v8_object_template_fetch_object(zend_object *obj);
+inline php_v8_object_template_t * php_v8_object_template_fetch_object(zend_object *obj);
 
 
 #define PHP_V8_OBJECT_TEMPLATE_FETCH(zv) php_v8_object_template_fetch_object(Z_OBJ_P(zv))
@@ -70,6 +70,10 @@ struct _php_v8_object_template_t {
     zend_object std;
 };
 
+inline php_v8_object_template_t * php_v8_object_template_fetch_object(zend_object *obj) {
+    return (php_v8_object_template_t *)((char *)obj - XtOffsetOf(php_v8_object_template_t, std));
+}
+
 inline v8::Local<v8::ObjectTemplate> php_v8_object_template_get_local(php_v8_object_template_t *php_v8_object_template) {
     return v8::Local<v8::ObjectTemplate>::New(php_v8_object_template->php_v8_isolate->isolate, *php_v8_object_template->persistent);
 }
diff --git a/src/php_v8_return_value.cc b/src/php_v8_return_value.cc
@@ -25,9 +25,6 @@ zend_class_entry *php_v8_return_value_class_entry;
 
 static zend_object_handlers php_v8_return_value_object_handlers;
 
-php_v8_return_value_t * php_v8_return_value_fetch_object(zend_object *obj) {
-    return (php_v8_return_value_t *)((char *)obj - XtOffsetOf(php_v8_return_value_t, std));
-}
 
 static void php_v8_return_value_free(zend_object *object) {
 
diff --git a/src/php_v8_return_value.h b/src/php_v8_return_value.h
@@ -30,9 +30,9 @@ extern "C" {
 
 extern zend_class_entry *php_v8_return_value_class_entry;
 
+inline php_v8_return_value_t *php_v8_return_value_fetch_object(zend_object *obj);
 extern php_v8_return_value_t *php_v8_return_value_create_from_return_value(zval *this_ptr, php_v8_isolate_t *php_v8_isolate, php_v8_context_t *php_v8_context, int accepts);
 extern void php_v8_return_value_mark_expired(php_v8_return_value_t *php_v8_return_value);
-extern php_v8_return_value_t *php_v8_return_value_fetch_object(zend_object *obj);
 
 
 #define PHP_V8_RETURN_VALUE_FETCH(zv) php_v8_return_value_fetch_object(Z_OBJ_P(zv))
@@ -78,6 +78,10 @@ struct _php_v8_return_value_t {
     zend_object std;
 };
 
+inline php_v8_return_value_t * php_v8_return_value_fetch_object(zend_object *obj) {
+    return (php_v8_return_value_t *)((char *)obj - XtOffsetOf(php_v8_return_value_t, std));
+}
+
 
 PHP_MINIT_FUNCTION (php_v8_return_value);
 
diff --git a/src/php_v8_script.cc b/src/php_v8_script.cc
@@ -27,10 +27,6 @@ zend_class_entry* php_v8_script_class_entry;
 static zend_object_handlers php_v8_script_object_handlers;
 
 
-php_v8_script_t * php_v8_script_fetch_object(zend_object *obj) {
-    return (php_v8_script_t *)((char *)obj - XtOffsetOf(php_v8_script_t, std));
-}
-
 php_v8_script_t *php_v8_create_script(zval *return_value, v8::Local<v8::Script> local_script, php_v8_context_t *php_v8_context) {
     assert(!local_script.IsEmpty());
 
diff --git a/src/php_v8_script.h b/src/php_v8_script.h
@@ -30,7 +30,7 @@ extern "C" {
 
 extern zend_class_entry *php_v8_script_class_entry;
 
-extern php_v8_script_t * php_v8_script_fetch_object(zend_object *obj);
+inline php_v8_script_t * php_v8_script_fetch_object(zend_object *obj);
 extern php_v8_script_t *php_v8_create_script(zval *return_value, v8::Local<v8::Script> local_script, php_v8_context_t *php_v8_context);
 
 #define PHP_V8_FETCH_SCRIPT(zv) php_v8_script_fetch_object(Z_OBJ_P(zv))
@@ -62,6 +62,10 @@ struct _php_v8_script_t {
   zend_object std;
 };
 
+inline php_v8_script_t * php_v8_script_fetch_object(zend_object *obj) {
+    return (php_v8_script_t *)((char *)obj - XtOffsetOf(php_v8_script_t, std));
+}
+
 inline v8::Local<v8::Script> php_v8_script_get_local(php_v8_script_t *php_v8_script) {
     return v8::Local<v8::Script>::New(php_v8_script->php_v8_isolate->isolate, *php_v8_script->persistent);
 }
diff --git a/src/php_v8_startup_data.cc b/src/php_v8_startup_data.cc
@@ -26,10 +26,6 @@ zend_class_entry *php_v8_startup_data_class_entry;
 static zend_object_handlers php_v8_startup_data_object_handlers;
 
 
-php_v8_startup_data_t * php_v8_startup_data_fetch_object(zend_object *obj) {
-    return (php_v8_startup_data_t *) ((char *) obj - XtOffsetOf(php_v8_startup_data_t, std));
-}
-
 void php_v8_startup_data_create(zval *return_value, v8::StartupData *blob) {
     object_init_ex(return_value, this_ce);
 
diff --git a/src/php_v8_startup_data.h b/src/php_v8_startup_data.h
@@ -27,7 +27,7 @@ extern "C" {
 
 extern zend_class_entry* php_v8_stack_frame_class_entry;
 
-extern php_v8_startup_data_t * php_v8_startup_data_fetch_object(zend_object *obj);
+inline php_v8_startup_data_t * php_v8_startup_data_fetch_object(zend_object *obj);
 
 #define PHP_V8_STARTUP_DATA_FETCH(zv) php_v8_startup_data_fetch_object(Z_OBJ_P(zv))
 #define PHP_V8_STARTUP_DATA_FETCH_INTO(pzval, into) php_v8_startup_data_t *(into) = PHP_V8_STARTUP_DATA_FETCH((pzval))
@@ -38,6 +38,9 @@ struct _php_v8_startup_data_t {
     zend_object std;
 };
 
+inline php_v8_startup_data_t * php_v8_startup_data_fetch_object(zend_object *obj) {
+    return (php_v8_startup_data_t *) ((char *) obj - XtOffsetOf(php_v8_startup_data_t, std));
+}
 
 PHP_MINIT_FUNCTION(php_v8_startup_data);
 
diff --git a/src/php_v8_unbound_script.cc b/src/php_v8_unbound_script.cc
@@ -27,10 +27,6 @@ zend_class_entry* php_v8_unbound_script_class_entry;
 static zend_object_handlers php_v8_unbound_script_object_handlers;
 
 
-php_v8_unbound_script_t * php_v8_unbound_script_fetch_object(zend_object *obj) {
-    return (php_v8_unbound_script_t *)((char *)obj - XtOffsetOf(php_v8_unbound_script_t, std));
-}
-
 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) {
     assert(!unbound_script.IsEmpty());
 
diff --git a/src/php_v8_unbound_script.h b/src/php_v8_unbound_script.h
@@ -29,6 +29,7 @@ extern "C" {
 
 extern zend_class_entry *php_v8_unbound_script_class_entry;
 
+inline php_v8_unbound_script_t * php_v8_unbound_script_fetch_object(zend_object *obj);
 extern v8::Local<v8::UnboundScript> php_v8_unbound_script_get_local(php_v8_unbound_script_t *php_v8_unbound_script);
 extern 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);
 
@@ -62,6 +63,10 @@ struct _php_v8_unbound_script_t {
   zend_object std;
 };
 
+inline php_v8_unbound_script_t * php_v8_unbound_script_fetch_object(zend_object *obj) {
+    return (php_v8_unbound_script_t *)((char *)obj - XtOffsetOf(php_v8_unbound_script_t, std));
+}
+
 inline v8::Local<v8::UnboundScript> php_v8_unbound_script_get_local(php_v8_unbound_script_t *php_v8_unbound_script) {
     return v8::Local<v8::UnboundScript>::New(php_v8_unbound_script->php_v8_isolate->isolate, *php_v8_unbound_script->persistent);
 }
diff --git a/src/php_v8_value.cc b/src/php_v8_value.cc
@@ -51,10 +51,6 @@ zend_class_entry *php_v8_value_class_entry;
 static zend_object_handlers php_v8_value_object_handlers;
 
 
-php_v8_value_t *php_v8_value_fetch_object(zend_object *obj) {
-    return (php_v8_value_t *)((char *)obj - XtOffsetOf(php_v8_value_t, std));
-}
-
 static void php_v8_value_weak_callback(const v8::WeakCallbackInfo<v8::Persistent<v8::Value>>& data) {
     v8::Isolate *isolate = data.GetIsolate();
     php_v8_isolate_t *php_v8_isolate = PHP_V8_ISOLATE_FETCH_REFERENCE(isolate);
diff --git a/src/php_v8_value.h b/src/php_v8_value.h

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,6 @@ zend_class_entry* php_v8_context_class_entry;`
`26`	`26`	`static zend_object_handlers php_v8_context_object_handlers;`
`27`	`27`
`28`	`28`
`29`		`-php_v8_context_t * php_v8_context_fetch_object(zend_object *obj) {`
`30`		`- return (php_v8_context_t )((char )obj - XtOffsetOf(php_v8_context_t, std));`
`31`		`-}`
`32`		`-`
`33`	`29`	`static void php_v8_context_free(zend_object *object)`
`34`	`30`	`{`
`35`	`31`	`php_v8_context_t *php_v8_context = php_v8_context_fetch_object(object);`