Remove need for -Wno-discarded-qualifiers/-Wno-incompatible-pointer-types-discards-qualifiers/-Wno-unused-function compilation flags

Author: touilleMan

src/godot/builtins_pxd/conversion.pxd.j2

@@ -2,7 +2,7 @@
 cdef bint gd_variant_supports_py_type(object pytype)
 cdef object gd_to_py_type(gdextension_interface.GDExtensionVariantType gdtype)
 cdef gdextension_interface.GDExtensionVariantType py_to_gd_type(object pytype)
-cdef object gd_variant_steal_into_pyobj(const gd_variant_t *gdvar)
+cdef object gd_variant_steal_into_pyobj(gd_variant_t *gdvar)
 cdef object gd_variant_copy_into_pyobj(const gd_variant_t *gdvar)
 cdef bint gd_variant_steal_from_pyobj(object pyobj, gd_variant_t *gdvar)
 

src/godot/builtins_pyx/conversion.pyx.j2

@@ -66,7 +66,7 @@ cdef gdextension_interface.GDExtensionVariantType py_to_gd_type(object pytype):
 #########################################################################
 
 
-cdef object gd_variant_steal_into_pyobj(const gd_variant_t *gdvar):
+cdef object gd_variant_steal_into_pyobj(gd_variant_t *gdvar):
     cdef gdextension_interface.GDExtensionVariantType gdtype = gdptrs.gdptr_variant_get_type(gdvar)
     if gdtype == gdextension_interface.GDEXTENSION_VARIANT_TYPE_OBJECT:
         # TODO: This conversion relies on godot String and lookup into bindings
@@ -76,11 +76,11 @@ cdef object gd_variant_steal_into_pyobj(const gd_variant_t *gdvar):
         return BaseGDObject.cast_from_variant(gdvar)
     # TODO: Would it be possible to directly dig into the variant for simple types ?
     elif gdtype == gdextension_interface.{{ api.bool_type.variant_type_name }}:
-        return gdapi.gd_{{ api.bool_type.snake_name }}_from_variant(<gd_variant_t*>gdvar) == 1
+        return gdapi.gd_{{ api.bool_type.snake_name }}_from_variant(gdvar) == 1
     elif gdtype == gdextension_interface.{{ api.int_type.variant_type_name }}:
-        return gdapi.gd_{{ api.int_type.snake_name }}_from_variant(<gd_variant_t*>gdvar)
+        return gdapi.gd_{{ api.int_type.snake_name }}_from_variant(gdvar)
     elif gdtype == gdextension_interface.{{ api.float_type.variant_type_name }}:
-        return gdapi.gd_{{ api.float_type.snake_name }}_from_variant(<gd_variant_t*>gdvar)
+        return gdapi.gd_{{ api.float_type.snake_name }}_from_variant(gdvar)
 {% for builtin in api.builtins %}
     elif gdtype == gdextension_interface.{{ builtin.variant_type_name }}:
         return _gd_variant_steal_into_pyobj_{{ builtin.cy_type }}(gdvar)
@@ -93,18 +93,22 @@ cdef object gd_variant_steal_into_pyobj(const gd_variant_t *gdvar):
 
 
 {% for builtin in api.builtins if not builtin.is_nil %}
-cdef inline object _gd_variant_steal_into_pyobj_{{ builtin.cy_type }}(const gd_variant_t *gdvar):
+cdef inline object _gd_variant_steal_into_pyobj_{{ builtin.cy_type }}(gd_variant_t *gdvar):
     cdef {{ builtin.cy_type }} ret = {{ builtin.cy_type }}.__new__({{ builtin.cy_type }})
-    ret._gd_data = gdapi.gd_{{ builtin.snake_name }}_from_variant(<gd_variant_t *>gdvar)
+    ret._gd_data = gdapi.gd_{{ builtin.snake_name }}_from_variant(gdvar)
+{% if builtin.is_stack_only %}
+    # Skip `gdapi.gd_variant_del(gdvar)` since this variant contains a builtin
+    # that doesn't have destructor.
+{% else %}
     gdapi.gd_variant_del(gdvar)
+{% endif %}
     return ret
 {% endfor %}
 
 
 cdef object gd_variant_copy_into_pyobj(const gd_variant_t *gdvar):
     cdef gd_variant_t copy
-    # TODO: must do an ugly cast because autopxd2 ignores const qualifiers in the C headers
-    gdptrs.gdptr_variant_new_copy(&copy, <gd_variant_t *>gdvar)
+    gdptrs.gdptr_variant_new_copy(&copy, gdvar)
     return gd_variant_steal_into_pyobj(&copy)
 
 

src/godot/classes.pxd.j2

@@ -13,12 +13,10 @@ cdef class BaseGDObject:
         ret._gd_ptr = obj
         return ret #}
 
-    # TODO: In theory we should pass a `const gd_variant_t *gdvar` since the variant
-    # is not modified, however `GDExtensionTypeFromVariantConstructorFunc` doesn't
-    # specified a const to the variant parameter...
     @staticmethod
-    cdef inline object cast_from_variant(gd_variant_t *gdvar):
-        cdef gd_object_t obj = gdapi.gd_object_from_variant(gdvar)
+    cdef inline object cast_from_variant(const gd_variant_t *gdvar):
+        # TODO: cast to remove const due to `GDExtensionTypeFromVariantConstructorFunc`
+        cdef gd_object_t obj = gdapi.gd_object_from_variant(<gd_variant_t *>gdvar)
         if obj == NULL:
             return None
         cdef object class_name = _object_call(obj, "get_class", [])

src/godot/hazmat/gdapi_pxd/meth.pxd.j2

@@ -102,25 +102,27 @@ cdef inline {{ render_utility_function_signature(builtin) }}:
 
 
 {% macro render_builtin_from_variant_signature(builtin) %}
-{{ builtin.c_type }} gd_{{ builtin.snake_name }}_from_variant(gd_variant_t *val)
+{{ builtin.c_type }} gd_{{ builtin.snake_name }}_from_variant(const gd_variant_t *val)
 {%- endmacro %}
 
 
 {% macro render_builtin_into_variant_signature(builtin) %}
 {%- if builtin.is_scalar %}
-gd_variant_t gd_{{ builtin.snake_name }}_into_variant({{ builtin.c_type }} val)
+gd_variant_t gd_{{ builtin.snake_name }}_into_variant(const {{ builtin.c_type }} val)
 {%- else %}
-gd_variant_t gd_{{ builtin.snake_name }}_into_variant({{ builtin.c_type }} *val)
+gd_variant_t gd_{{ builtin.snake_name }}_into_variant(const {{ builtin.c_type }} *val)
 {%- endif %}
 {% endmacro %}
 
 
 {% macro render_builtin_object_variant_conversions(builtin) %}
-cdef inline gdextension_interface.GDExtensionObjectPtr gd_object_from_variant(gd_variant_t *val):
+cdef inline gdextension_interface.GDExtensionObjectPtr gd_object_from_variant(const gd_variant_t *val):
     cdef gdextension_interface.GDExtensionObjectPtr ret
-    gdptrs.gdptr_object_from_variant(&ret, val)
+    # TODO: cast to remove const due to `GDExtensionTypeFromVariantConstructorFunc`
+    gdptrs.gdptr_object_from_variant(&ret, <gd_variant_t *>val)
     return ret
 
+
 cdef inline gd_variant_t gd_object_into_variant(gdextension_interface.GDExtensionObjectPtr val):
     cdef gd_variant_t ret
     gdptrs.gdptr_object_into_variant(&ret, &val)
@@ -136,12 +138,15 @@ cdef inline {{ render_builtin_from_variant_signature(builtin) }}:
     # TODO: no longer needed once https://github.com/godotengine/godot/pull/35813 is merged
     cdef {{ builtin.c_type }} ret = gd_{{ builtin.snake_name }}_new()
 {% endif %}
-    gdptrs.gdptr_{{ builtin.snake_name }}_from_variant(&ret, val)
+    # TODO: cast to remove const due to `GDExtensionTypeFromVariantConstructorFunc`
+    gdptrs.gdptr_{{ builtin.snake_name }}_from_variant(&ret, <gd_variant_t *>val)
     return ret
 
+
 cdef inline {{ render_builtin_into_variant_signature(builtin) }}:
     cdef gd_variant_t ret
-    gdptrs.gdptr_{{ builtin.snake_name }}_into_variant(&ret, {{ "&val" if builtin.is_scalar else "val"}})
+    # TODO: cast to remove const due to `GDExtensionVariantFromTypeConstructorFunc`
+    gdptrs.gdptr_{{ builtin.snake_name }}_into_variant(&ret, <{{ builtin.c_type }} *>{{ "&val" if builtin.is_scalar else "val"}})
     return ret
 {% endmacro %}
 

src/godot/meson.build

@@ -116,19 +116,9 @@ else
 endif
 
 
-# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
-# hence -Wno-discarded-qualifiers
-if host_platform.startswith('windows')
-    builtins_c_args = []
-else
-    builtins_c_args = ['-Wno-discarded-qualifiers', '-Wno-incompatible-pointer-types-discards-qualifiers']
-endif
-
-
 shared_library(
     'builtins',
     cbuiltins,
-    c_args: builtins_c_args,
     gnu_symbol_visibility: 'hidden',  # Used by both clang & gcc (see https://gcc.gnu.org/wiki/Visibility)
     dependencies : [dep_godot, dep_python, dep_pythonscript],
     install_rpath: builtins_rpath,  # To find libpython
@@ -176,21 +166,9 @@ else
 endif
 
 
-# Cython's cdef inline methods are turned into static inline C functions that
-# produced `defined but not used` errors, hence the `-Wno-unused-function`
-# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
-# hence -Wno-discarded-qualifiers
-if host_platform.startswith('windows')
-    classes_c_args = []
-else
-    classes_c_args = ['-Wno-discarded-qualifiers', '-Wno-incompatible-pointer-types-discards-qualifiers', '-Wno-unused-function']
-endif
-
-
 shared_library(
     'classes',
     cclasses,
-    c_args: classes_c_args,
     gnu_symbol_visibility: 'hidden',  # Used by both clang & gcc (see https://gcc.gnu.org/wiki/Visibility)
     dependencies : [dep_godot, dep_python, dep_pythonscript],
     install_rpath: classes_rpath,  # To find libpython
@@ -249,21 +227,9 @@ else
 endif
 
 
-# Cython's cdef inline methods are turned into static inline C functions that
-# produced `defined but not used` errors, hence the `-Wno-unused-function`
-# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
-# hence -Wno-discarded-qualifiers
-if host_platform.startswith('windows')
-    _lang_c_args = []
-else
-    _lang_c_args = ['-Wno-discarded-qualifiers', '-Wno-incompatible-pointer-types-discards-qualifiers', '-Wno-unused-function']
-endif
-
-
 shared_library(
     '_lang',
     c_lang,
-    c_args: _lang_c_args,
     gnu_symbol_visibility: 'hidden',  # Used by both clang & gcc (see https://gcc.gnu.org/wiki/Visibility)
     dependencies : [dep_godot, dep_python, dep_pythonscript],
     install_rpath: _lang_rpath,  # To find libpython

src/meson.build

@@ -210,21 +210,10 @@ else
     lib_pythonscript_rpath = ''
 endif
 
-# Cython's cdef inline methods are turned into static inline C functions that
-# produced `defined but not used` errors, hence the `-Wno-unused-function`
-# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
-# hence -Wno-discarded-qualifiers
-if host_platform.startswith('windows')
-    lib__pythonscript_c_args = []
-else
-    lib__pythonscript_c_args = ['-Wno-discarded-qualifiers', '-Wno-incompatible-pointer-types-discards-qualifiers', '-Wno-unused-function']
-endif
-
 
 lib_pythonscript = shared_library(
     'pythonscript',
     ['pythonscript.c', c_pythonscript_gdextension_ptrs],
-    c_args: lib__pythonscript_c_args,
     gnu_symbol_visibility: 'hidden',  # Used by both clang & gcc (see https://gcc.gnu.org/wiki/Visibility)
     dependencies: [dep_godot, dep_python],
     install_rpath: lib_pythonscript_rpath,  # To find libpython