]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
codegen: Drop dead lambda-in-constructor path
authorRico Tzschichholz <ricotz@ubuntu.com>
Sat, 6 Jan 2018 20:03:48 +0000 (21:03 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sun, 7 Jan 2018 19:26:03 +0000 (20:26 +0100)
Unreachable since 097b31af35cd587674a8cddd5dccc49c01b89858

codegen/valaccodebasemodule.vala

index 7c8edb482a3fc34621454dfb23e156b449560871..a65a3f4f51c4a4b5c34fb1b93df04b6aebe63b93 100644 (file)
@@ -5611,18 +5611,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        CCodeExpression delegate_target = get_result_cexpression ("self");
                        delegate_target = convert_to_generic_pointer (delegate_target, get_this_type ());
                        if (expr_owned || delegate_type.is_called_once) {
-                               if (get_this_type () != null) {
-                                       var ref_call = new CCodeFunctionCall (get_dup_func_expression (get_this_type (), lambda.source_reference));
-                                       ref_call.add_argument (delegate_target);
-                                       delegate_target = ref_call;
-                                       set_delegate_target_destroy_notify (lambda, get_destroy_func_expression (get_this_type ()));
-                               } else {
-                                       // in constructor
-                                       var ref_call = new CCodeFunctionCall (new CCodeIdentifier ("g_object_ref"));
-                                       ref_call.add_argument (delegate_target);
-                                       delegate_target = ref_call;
-                                       set_delegate_target_destroy_notify (lambda, new CCodeIdentifier ("g_object_unref"));
-                               }
+                               var ref_call = new CCodeFunctionCall (get_dup_func_expression (get_this_type (), lambda.source_reference));
+                               ref_call.add_argument (delegate_target);
+                               delegate_target = ref_call;
+                               set_delegate_target_destroy_notify (lambda, get_destroy_func_expression (get_this_type ()));
                        } else {
                                set_delegate_target_destroy_notify (lambda, new CCodeConstant ("NULL"));
                        }