]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Revert "codegen: Dup arrays only if length > 0, this consistently returns NULL (POSIX)"
authorRico Tzschichholz <ricotz@ubuntu.com>
Wed, 27 May 2020 07:22:32 +0000 (09:22 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Wed, 27 May 2020 07:34:36 +0000 (09:34 +0200)
This reverts commit 18847c9221362081c9a9d37e2922f3e3ea648088.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/999

codegen/valaccodearraymodule.vala

index ee0fa7780cfc77145adc7b946f34971595b284ac..5fa9ea23df4451ff67712e3b78127212e5f9cfe1 100644 (file)
@@ -529,10 +529,6 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
                push_context (new EmitContext ());
                push_function (function);
 
-               // only attempt to dup if length > 0, this consistently returns NULL
-               var clengthcheck = new CCodeBinaryExpression (CCodeBinaryOperator.GREATER_THAN, new CCodeIdentifier ("length"), new CCodeConstant ("0"));
-               ccode.open_if (clengthcheck);
-
                if (requires_copy (array_type.element_type)) {
                        var cvardecl = new CCodeVariableDeclarator ("result");
                        CCodeFunctionCall gnew;
@@ -603,9 +599,6 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
                        }
                }
 
-               ccode.close ();
-               ccode.add_return (new CCodeIdentifier ("NULL"));
-
                // append to file
 
                cfile.add_function_declaration (function);