diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-04-18 21:02:21 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-04-28 08:47:42 +0200 |
| commit | dcd704590e9ca802fb72f1a24263bf81b2a96b8a (patch) | |
| tree | 85f8b74293b8dfbe42c8585caf5eb27eef7fb871 | |
| parent | 5eecc0208570747b2be186ce2169832562cc65e5 (diff) | |
| download | vala-dcd704590e9ca802fb72f1a24263bf81b2a96b8a.tar.gz | |
codegen: Use if-clause for is_in_destructor() condition to be more clear
| -rw-r--r-- | codegen/valaccodebasemodule.vala | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala index d746f6050..c00ddc7be 100644 --- a/codegen/valaccodebasemodule.vala +++ b/codegen/valaccodebasemodule.vala @@ -2193,11 +2193,15 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator { unowned DataType? this_type = get_this_type (); if (this_type != null && (!in_creation_method_with_chainup || current_method.body != b)) { - var ref_call = new CCodeFunctionCall (get_dup_func_expression (this_type, b.source_reference)); - ref_call.add_argument (get_this_cexpression ()); - - // never increase reference count for self in finalizers to avoid infinite recursion on following unref - var instance = (is_in_destructor () ? (CCodeExpression) new CCodeIdentifier ("self") : (CCodeExpression) ref_call); + CCodeExpression instance; + if (is_in_destructor ()) { + // never increase reference count for self in finalizers to avoid infinite recursion on following unref + instance = new CCodeIdentifier ("self"); + } else { + var ref_call = new CCodeFunctionCall (get_dup_func_expression (this_type, b.source_reference)); + ref_call.add_argument (get_this_cexpression ()); + instance = ref_call; + } ccode.add_assignment (new CCodeMemberAccess.pointer (get_variable_cexpression ("_data%d_".printf (block_id)), "self"), instance); } |