codegen: g_free is already NULL-safe

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 939b256ca4c8b1a26884b7b36f5e92bb8f157578..89ee6bcb233dbd0b27e624d7f1f5e836de60b481 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3074,7 +3074,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        var freeid = (CCodeIdentifier) element_destroy_func_expression;
                        string free0_func = "_%s0_".printf (freeid.name);
 
-                       if (add_wrapper (free0_func)) {
+                       // g_free is already NULL-safe
+                       if (freeid.name == "g_free") {
+                               free0_func = freeid.name;
+                       } else if (add_wrapper (free0_func)) {
                                var function = new CCodeFunction (free0_func, "void");
                                function.modifiers = CCodeModifiers.STATIC;
 
@@ -3352,7 +3355,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        var freeid = (CCodeIdentifier) ccall.call;
                        string free0_func = "_%s0".printf (freeid.name);
 
-                       if (add_wrapper (free0_func)) {
+                       // g_free is already NULL-safe
+                       if (freeid.name == "g_free") {
+                               free0_func = freeid.name;
+                       } else if (add_wrapper (free0_func)) {
                                var macro = destroy_value (new GLibValue (type, new CCodeIdentifier ("var"), true), true);
                                cfile.add_type_declaration (new CCodeMacroReplacement.with_expression ("%s(var)".printf (free0_func), macro));
                        }