diff options
author | Jürg Billeter <j@bitron.ch> | 2011-03-27 20:26:37 +0200 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2011-03-27 20:26:37 +0200 |
commit | cf1e6dd2c1af64ddfe1b2332355c9a437f8c6ddf (patch) | |
tree | 29b7054d0814fc4975ce2fb30debe27a0818ebad /codegen/valaccodememberaccessmodule.vala | |
parent | d314806f973a06d20c4dde006348279d86bbaf03 (diff) | |
download | vala-cf1e6dd2c1af64ddfe1b2332355c9a437f8c6ddf.tar.gz |
codegen: Fix freeing on assignment to fields of generic type
Fixes bug 645773.
Diffstat (limited to 'codegen/valaccodememberaccessmodule.vala')
-rw-r--r-- | codegen/valaccodememberaccessmodule.vala | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala index 285c09a71..7c14732fa 100644 --- a/codegen/valaccodememberaccessmodule.vala +++ b/codegen/valaccodememberaccessmodule.vala @@ -493,10 +493,15 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule { /* Returns lvalue access to the given field */ public override TargetValue get_field_cvalue (Field field, TargetValue? instance) { - var result = new GLibValue (field.variable_type.copy ()); + var value_type = field.variable_type.copy (); + if (instance != null) { + value_type = value_type.get_actual_type (instance.value_type, null, field); + } + + var result = new GLibValue (value_type); - var array_type = field.variable_type as ArrayType; - var delegate_type = field.variable_type as DelegateType; + var array_type = result.value_type as ArrayType; + var delegate_type = result.value_type as DelegateType; if (field.binding == MemberBinding.INSTANCE) { CCodeExpression pub_inst = null; @@ -558,12 +563,12 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule { if (((TypeSymbol) field.parent_symbol).is_reference_type ()) { result.delegate_target_cvalue = new CCodeMemberAccess.pointer (inst, target_cname); - if (field.variable_type.value_owned) { + if (result.value_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeMemberAccess.pointer (inst, target_destroy_notify_cname); } } else { result.delegate_target_cvalue = new CCodeMemberAccess (inst, target_cname); - if (field.variable_type.value_owned) { + if (result.value_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeMemberAccess (inst, target_destroy_notify_cname); } } @@ -620,7 +625,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule { } } else if (delegate_type != null && delegate_type.delegate_symbol.has_target && !field.no_delegate_target) { result.delegate_target_cvalue = new CCodeIdentifier (get_delegate_target_cname (field.get_cname ())); - if (field.variable_type.value_owned) { + if (result.value_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (field.get_cname ())); } } |