[glib/gobject-speedups: 17/18] Avoid g_param_spec_get_redirect_target
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/gobject-speedups: 17/18] Avoid g_param_spec_get_redirect_target
- Date: Sat, 21 May 2022 11:16:45 +0000 (UTC)
commit b8a2277d8518d16d8e6f3fea474b8f165c1e38ea
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 19 21:00:37 2022 -0400
Avoid g_param_spec_get_redirect_target
Inline the getting of the redirect target.
This is a rare thing, and the calls were
showing up in profiles.
gobject/gobject.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gobject/gobject.c b/gobject/gobject.c
index bec7deee85..24fa97679c 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1581,7 +1581,6 @@ object_get_property (GObject *object,
{
GObjectClass *class = g_type_class_peek (pspec->owner_type);
guint param_id = PARAM_SPEC_PARAM_ID (pspec);
- GParamSpec *redirect;
if (class == NULL)
{
@@ -1590,9 +1589,8 @@ object_get_property (GObject *object,
return;
}
- redirect = g_param_spec_get_redirect_target (pspec);
- if (redirect)
- pspec = redirect;
+ if (((GTypeInstance *)pspec)->g_class->g_type == G_TYPE_PARAM_OVERRIDE)
+ pspec = ((GParamSpecOverride *)pspec)->overridden;
consider_issuing_property_deprecation_warning (pspec);
@@ -1608,7 +1606,6 @@ object_set_property (GObject *object,
GObjectClass *class = g_type_class_peek (pspec->owner_type);
GParamSpecClass *pclass;
guint param_id = PARAM_SPEC_PARAM_ID (pspec);
- GParamSpec *redirect;
if (G_UNLIKELY (class == NULL))
{
@@ -1617,13 +1614,13 @@ object_set_property (GObject *object,
return;
}
- redirect = g_param_spec_get_redirect_target (pspec);
- if (redirect)
- pspec = redirect;
+ if (((GTypeInstance *)pspec)->g_class->g_type == G_TYPE_PARAM_OVERRIDE)
+ pspec = ((GParamSpecOverride *)pspec)->overridden;
consider_issuing_property_deprecation_warning (pspec);
pclass = G_PARAM_SPEC_GET_CLASS (pspec);
+
if ((G_VALUE_TYPE (value) == pspec->value_type ||
g_value_type_compatible (G_VALUE_TYPE (value), pspec->value_type)) &&
(pclass->value_validate == NULL ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]