From: Yu Feng <rainwoodman@gmail.com>
Date: Sun, 1 Nov 2009 04:47:51 +0000 (-0400)
Subject: Run destructor code before member destruction in compact classes
X-Git-Tag: 0.7.10~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ebc2447d8b9cb34dda5933e8b733fd7f0b0125a;p=thirdparty%2Fvala.git

Run destructor code before member destruction in compact classes

Fixes bug 600285.

Signed-off-by: Yu Feng <rainwoodman@gmail.com>
---

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index ba9d11558..cd0d58e26 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -631,12 +631,12 @@ internal class Vala.GTypeModule : GErrorModule {
 
 				var cblock = new CCodeBlock ();
 
-				cblock.add_statement (instance_finalize_fragment);
-
 				if (cl.destructor != null) {
 					cblock.add_statement (cl.destructor.ccodenode);
 				}
 
+				cblock.add_statement (instance_finalize_fragment);
+
 				var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_slice_free"));
 				ccall.add_argument (new CCodeIdentifier (cl.get_cname ()));
 				ccall.add_argument (new CCodeIdentifier ("self"));