Unconst input and output args when checking method overrides

Author: lwaern-intel

py/dml/c_backend.py

@@ -811,13 +811,13 @@ def generate_implement_method(device, ifacestruct, meth, indices):
             # method in DML
             raise EMETH(meth.site, None, 'interface method is variadic')
         for ((mp, mt), it) in zip(meth.inp, iface_input_types):
-            if safe_realtype(mt).cmp(safe_realtype(it)) != 0:
+            if safe_realtype_unconst(mt).cmp(safe_realtype_unconst(it)) != 0:
                 raise EARGT(meth.site, 'implement', meth.name,
                             mt, mp, it, 'method')
         if iface_num_outputs and dml.globals.dml_version != (1, 2):
             [(_, mt)] = meth.outp
-            if safe_realtype(mt).cmp(
-                    safe_realtype(ifacemethtype.output_type)) != 0:
+            if safe_realtype_unconst(mt).cmp(
+                    safe_realtype_unconst(ifacemethtype.output_type)) != 0:
                 raise EARGT(meth.site, 'implement', meth.name,
                             mt, '<return value>', ifacemethtype.output_type,
                             'method')

py/dml/ctree.py

@@ -3160,8 +3160,8 @@ def mkInterfaceMethodRef(site, iface_node, indices, method_name):
 
     if (not isinstance(ftype, TFunction)
         or not ftype.input_types
-        or TPtr(safe_realtype(TNamed('conf_object_t'))).cmp(
-            safe_realtype(ftype.input_types[0])) != 0):
+        or TPtr(safe_realtype_unconst(TNamed('conf_object_t'))).cmp(
+            safe_realtype_unconst(ftype.input_types[0])) != 0):
         # non-method members are not accessible
         raise EMEMBER(site, struct_name, method_name)
 

py/dml/structure.py

@@ -674,7 +674,8 @@ def typecheck_method_override(m1, m2):
             # TODO move to caller
             (_, type1) = eval_type(t1, a1.site, None, global_scope)
             (_, type2) = eval_type(t2, a2.site, None, global_scope)
-            if safe_realtype(type1).cmp(safe_realtype(type2)) != 0:
+            if safe_realtype_unconst(type1).cmp(
+                    safe_realtype_unconst(type2)) != 0:
                 raise EMETH(a1.site, a2.site,
                             f"mismatching types in input argument {n1}")
 
@@ -683,7 +684,8 @@ def typecheck_method_override(m1, m2):
             ((n1, t1), (n2, t2)) = (a1.args, a2.args)
             (_, type1) = eval_type(t1, a1.site, None, global_scope)
             (_, type2) = eval_type(t2, a2.site, None, global_scope)
-            if safe_realtype(type1).cmp(safe_realtype(type2)) != 0:
+            if safe_realtype_unconst(type1).cmp(
+                    safe_realtype_unconst(type2)) != 0:
                 msg = "mismatching types in return value"
                 if len(outp1) > 1:
                     msg += f" {i + 1}"

py/dml/traits.py

@@ -394,11 +394,11 @@ def typecheck_method_override(left, right):
     if throws0 != throws1:
         raise EMETH(site0, site1, "different nothrow annotations")
     for ((n, t0), (_, t1)) in zip(inp0, inp1):
-        if realtype(t0).cmp(realtype(t1)) != 0:
+        if safe_realtype_unconst(t0).cmp(safe_realtype_unconst(t1)) != 0:
             raise EMETH(site0, site1,
                         "mismatching types in input argument %s" % (n,))
     for (i, ((_, t0), (_, t1))) in enumerate(zip(outp0, outp1)):
-        if realtype(t0).cmp(realtype(t1)) != 0:
+        if safe_realtype_unconst(t0).cmp(safe_realtype_unconst(t1)) != 0:
             raise EMETH(site0, site1,
                         "mismatching types in output argument %d" % (i + 1,))
 

py/dml/types.py

@@ -886,14 +886,14 @@ def cmp_fuzzy(self, other, consider_quals=False):
         cconst = conv_const if consider_quals else lambda c, t: t
         if not dml.globals.compat_dml12:
             if isinstance(other, (TArray, TPtr)):
-                return cconst(self.const, self.base).cmp(
+                return cconst(self.const, self.base).cmp_fuzzy(
                     cconst(other.const and isinstance(other, TArray),
                            other.base),
                     consider_quals)
         elif isinstance(other, (TPtr, TArray)):
             if self.base.void or other.base.void:
                 return 0
-            if (cconst(self.const, self.base).cmp(
+            if (cconst(self.const, self.base).cmp_fuzzy(
                     cconst(other.const and isinstance(other, TArray),
                            other.base), consider_quals) == 0):
                 return 0