[vala/staging] codegen: Drop dead lambda-in-constructor path
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] codegen: Drop dead lambda-in-constructor path
- Date: Sun, 7 Jan 2018 20:03:55 +0000 (UTC)
commit 0520da6b1d3c3282fe2a0307a7ae228f2b82c680
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Jan 6 21:03:48 2018 +0100
codegen: Drop dead lambda-in-constructor path
Unreachable since 097b31af35cd587674a8cddd5dccc49c01b89858
codegen/valaccodebasemodule.vala | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 7c8edb4..a65a3f4 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -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"));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]