From: Jeremy Philippe <jeremy.philippe@gmail.com>
Date: Wed, 7 Oct 2020 11:41:40 +0000 (+0200)
Subject: codegen: Reduce get_delegate_target/get_delegate_target_destroy_notify calls
X-Git-Tag: 0.51.1~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4d5b070886b11ada5e6700956e39f7a197c430;p=thirdparty%2Fvala.git

codegen: Reduce get_delegate_target/get_delegate_target_destroy_notify calls
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index dfbae93b4..b11992e17 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5389,13 +5389,15 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		set_cvalue (expr, new CCodeCastExpression (innercexpr, get_ccode_name (expr.type_reference)));
 
 		if (expr.type_reference is DelegateType) {
-			if (get_delegate_target (expr.inner) != null) {
-				set_delegate_target (expr, get_delegate_target (expr.inner));
+			var target = get_delegate_target (expr.inner);
+			if (target != null) {
+				set_delegate_target (expr, target);
 			} else {
 				set_delegate_target (expr, new CCodeConstant ("NULL"));
 			}
-			if (get_delegate_target_destroy_notify (expr.inner) != null) {
-				set_delegate_target_destroy_notify (expr, get_delegate_target_destroy_notify (expr.inner));
+			var target_destroy_notify = get_delegate_target_destroy_notify (expr.inner);
+			if (target_destroy_notify != null) {
+				set_delegate_target_destroy_notify (expr, target_destroy_notify);
 			} else {
 				set_delegate_target_destroy_notify (expr, new CCodeConstant ("NULL"));
 			}