Merge pull request #7026 from michaellilltokiwa/fix_soundness_issue

michaellilltokiwa · web-flow · commit 32be061dfa85 · 2026-04-30T15:44:04.000+02:00
fix soundness issue in `constraintAssignableFrom`
diff --git a/modules/base/src/container/Typed_Sequence.fz b/modules/base/src/container/Typed_Sequence.fz
@@ -98,7 +98,7 @@ public Typed_Sequence ref : Sequence container.Typed_Value is
   #
   # In case this `Typed_Sequence` is empty, the result is `e`.
   #
-  public typed_zip_and_fold(E type, Z type : typed_zipper E, b Typed_Sequence.this, e E, z Z) E
+  public typed_zip_and_fold(E type, Z type : container.typed_zipper E, b Typed_Sequence.this, e E, z Z) E
   =>
     abstract
 
diff --git a/modules/base/src/eff/try.fz b/modules/base/src/eff/try.fz
@@ -36,7 +36,7 @@
 #
 #     res := try ERROR_TYPE FALLIBLE_TYPE RESULT_TYPE code || (s->handle post condition failure `s`)
 #
-public try(ERROR type, F type : fallible ERROR, T type, code_try ()->T) is
+public try(ERROR type, F type : eff.fallible ERROR, T type, code_try ()->T) is
 
   # a local mutate used for storing an error
   # when throwing an exception
diff --git a/modules/base/src/fuzion/java.fz b/modules/base/src/fuzion/java.fz
@@ -50,7 +50,7 @@ public java is
   # A Java array
   #
   public Array(public T type,
-               public redef java_ref Java_Ref) ref : Sequence T, Java_Object java_ref
+               public redef java_ref Java_Ref) ref : Sequence T, fuzion.java.Java_Object java_ref
   is
     public length i32 ! fuzion.jvm =>
       fuzion.jvm.env.array_length T java_ref
@@ -108,7 +108,7 @@ public java is
 
   # Java's 'java.lang.String' type
   #
-  public Java_String(public redef java_ref Java_Ref) ref : String, Java_Object java_ref
+  public Java_String(public redef java_ref Java_Ref) ref : String, fuzion.java.Java_Object java_ref
   is
     public redef utf8 Sequence u8 =>
       (jvm.java_string_to_string java_ref).utf8
diff --git a/modules/base/src/time/duration.fz b/modules/base/src/time/duration.fz
@@ -38,7 +38,7 @@ module:public duration (
   #
   public nanos u64
   )
-  : Period,
+  : time.Period,
     property.orderable,
     property.hashable
 
diff --git a/modules/base/src/time/nano.fz b/modules/base/src/time/nano.fz
@@ -34,7 +34,7 @@
 # not be the right source of time to, e.g., feed an alarm clock that should
 # wake you up at 6h30 every morning.
 #
-public nano (p Nano_Time_Handler) : Clock is
+public nano (p Nano_Time_Handler) : time.Clock is
 
   # no guarantee can be given for precision nor resolution
   #
diff --git a/src/dev/flang/ast/AbstractType.java b/src/dev/flang/ast/AbstractType.java
@@ -717,12 +717,12 @@ boolean constraintAssignableFrom(Context context, AbstractType actual)
                 // NYI: BUG: Check: What about open generics?
                 result = actual.feature() == feature() &&
                   (actual.isThisType() || (genericsAssignable(actual, context) &&
-                                          (outer() == null || actual.outer() != null && outer().constraintAssignableFrom(actual.outer()))));
+                                          (outer() == null || actual.outer() != null && outer().isAssignableFromDirectly(actual.outer()).yes())));
                 for (var p: actual.feature().inherits())
                   {
                     if (!result)
                       {
-                        var pa = p.type().applyTypePars(actual);
+                        var pa = actualType(p.type().applyTypePars(actual));
                         result = pa!=actual && constraintAssignableFrom(context, pa);
                       }
                   }
diff --git a/tests/covariance/test_covariance.fz b/tests/covariance/test_covariance.fz
@@ -75,7 +75,7 @@ test_covariance is
 
   # integer mod 2 implementation of num0
   #
-  intM2(is_zero bool) : num0 is
+  intM2(is_zero bool) : test_covariance.num0 is
     fixed z => intM2 true
     fixed o => intM2 false
     fixed redef type.zero => test_covariance.intM2 true
@@ -87,7 +87,7 @@ test_covariance is
 
   # integer mod 5 implementation of num0
   #
-  intM5(v u8) : num0 is
+  intM5(v u8) : test_covariance.num0 is
     fixed z => intM5 0
     fixed o => intM5 1
     fixed redef type.zero => test_covariance.intM5 0
diff --git a/tests/reg_issue1294/issue1294.fz b/tests/reg_issue1294/issue1294.fz
@@ -65,7 +65,7 @@ scenario2 is
       _ : scenario2.M T is
         fixed redef e => zero
 
-  b : a scenario2.b is
+  b : scenario2.a scenario2.b is
 
     fixed redef type.zero scenario2.b => scenario2.b
 
@@ -328,7 +328,7 @@ scenario8 is
 
   # integer mod 2 implementation of num0
   #
-  intM2(is_zero bool) : num0 is
+  intM2(is_zero bool) : scenario8.num0 is
     fixed z => intM2 true
     fixed o => intM2 false
     fixed redef type.zero => scenario8.intM2 true
diff --git a/tests/reg_issue5569/reg_issue5569.fz b/tests/reg_issue5569/reg_issue5569.fz
@@ -48,7 +48,8 @@ reg_issue5569 =>
 
   # using a different outer type `t2`
   t2 : t is
-  yak "expecting t2.i: "; t2.e ! v t2.e
+  # gives error: Incompatible type parameter:
+  # yak "expecting t2.i: "; t2.e ! v t2.e
 
   # using a different inner type `e2`
   t.e2 : t.e is
@@ -66,7 +67,8 @@ reg_issue5569 =>
     say "{type_of x} {type_of y}"
 
   yak "expecting t.i /t.e.j  : "; t.e   ! w t.e
-  yak "expecting t2.i/t2.e.j : "; t2.e  ! w t2.e
+  # gives error: Incompatible type parameter:
+  # yak "expecting t2.i/t2.e.j : "; t2.e  ! w t2.e
   yak "expecting t.i /t.e2.j : "; t.e2  ! w t.e2
   yak "expecting t2.i/t2.e2.j: "; t2.e2 ! w t2.e2
 
@@ -80,7 +82,8 @@ reg_issue5569 =>
     say "{type_of x} {type_of y}"
 
   yak "expecting option (array t.i /t.e.j  ): "; t.e   ! w2 t.e
-  yak "expecting option (array t2.i/t2.e.j ): "; t2.e  ! w2 t2.e
+  # gives error: Incompatible type parameter:
+  # yak "expecting option (array t2.i/t2.e.j ): "; t2.e  ! w2 t2.e
   yak "expecting option (array t.i /t.e2.j ): "; t.e2  ! w2 t.e2
   yak "expecting option (array t2.i/t2.e2.j): "; t2.e2 ! w2 t2.e2
 
diff --git a/tests/reg_issue5569/reg_issue5569.fz.expected_out b/tests/reg_issue5569/reg_issue5569.fz.expected_out
@@ -1,12 +1,9 @@
 expecting t.i : Type of 'reg_issue5569.t.i'
-expecting t2.i: Type of 'reg_issue5569.t2.i'
 expecting t.i : Type of 'reg_issue5569.t.i'
 expecting t2.i: Type of 'reg_issue5569.t2.i'
 expecting t.i /t.e.j  : Type of 'reg_issue5569.t.i' Type of 'reg_issue5569.t.e.j'
-expecting t2.i/t2.e.j : Type of 'reg_issue5569.t2.i' Type of 'reg_issue5569.t2.e.j'
 expecting t.i /t.e2.j : Type of 'reg_issue5569.t.i' Type of 'reg_issue5569.t.e2.j'
 expecting t2.i/t2.e2.j: Type of 'reg_issue5569.t2.i' Type of 'reg_issue5569.t2.e2.j'
 expecting option (array t.i /t.e.j  ): Type of 'option (array reg_issue5569.t.i)' Type of 'option (array reg_issue5569.t.e.j)'
-expecting option (array t2.i/t2.e.j ): Type of 'option (array reg_issue5569.t2.i)' Type of 'option (array reg_issue5569.t2.e.j)'
 expecting option (array t.i /t.e2.j ): Type of 'option (array reg_issue5569.t.i)' Type of 'option (array reg_issue5569.t.e2.j)'
 expecting option (array t2.i/t2.e2.j): Type of 'option (array reg_issue5569.t2.i)' Type of 'option (array reg_issue5569.t2.e2.j)'
diff --git a/tests/reg_issue7025/Makefile b/tests/reg_issue7025/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the Fuzion language implementation.
+#
+# The Fuzion language implementation is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, version 3 of the License.
+#
+# The Fuzion language implementation is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License along with The
+# Fuzion language implementation.  If not, see <https://www.gnu.org/licenses/>.
+
+
+# -----------------------------------------------------------------------
+#
+#  Tokiwa Software GmbH, Germany
+#
+#  Source code of Fuzion test Makefile
+#
+# -----------------------------------------------------------------------
+
+override NAME = reg_issue7025
+include ../simple.mk
diff --git a/tests/reg_issue7025/reg_issue7025.fz b/tests/reg_issue7025/reg_issue7025.fz
@@ -0,0 +1,33 @@
+# This file is part of the Fuzion language implementation.
+#
+# The Fuzion language implementation is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, version 3 of the License.
+#
+# The Fuzion language implementation is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License along with The
+# Fuzion language implementation.  If not, see <https://www.gnu.org/licenses/>.
+
+
+# -----------------------------------------------------------------------
+#
+#  Tokiwa Software GmbH, Germany
+#
+#  Source code of Fuzion test reg_issue7025
+#
+# -----------------------------------------------------------------------
+
+t is
+  e is
+
+v(E type : t.e) =>
+  unit
+
+
+t2 : t is
+v t2.e
+
diff --git a/tests/reg_issue7025/reg_issue7025.fz.expected_err b/tests/reg_issue7025/reg_issue7025.fz.expected_err
@@ -0,0 +1,8 @@
+
+--CURDIR--/reg_issue7025.fz:32:1: error 1: Incompatible type parameter
+v t2.e
+^
+formal type parameter 'E : t.e'
+actual type parameter 't2.e'
+
+one error.
diff --git a/tests/reg_issue7025/reg_issue7025.fz.expected_out b/tests/reg_issue7025/reg_issue7025.fz.expected_out

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public Typed_Sequence ref : Sequence container.Typed_Value is`
`98`	`98`	`#`
`99`	`99`	# In case this `Typed_Sequence` is empty, the result is `e`.
`100`	`100`	`#`
`101`		`- public typed_zip_and_fold(E type, Z type : typed_zipper E, b Typed_Sequence.this, e E, z Z) E`
	`101`	`+ public typed_zip_and_fold(E type, Z type : container.typed_zipper E, b Typed_Sequence.this, e E, z Z) E`
`102`	`102`	`=>`
`103`	`103`	`abstract`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#`
`37`	`37`	# res := try ERROR_TYPE FALLIBLE_TYPE RESULT_TYPE code \|\| (s->handle post condition failure `s`)
`38`	`38`	`#`
`39`		`-public try(ERROR type, F type : fallible ERROR, T type, code_try ()->T) is`
	`39`	`+public try(ERROR type, F type : eff.fallible ERROR, T type, code_try ()->T) is`
`40`	`40`
`41`	`41`	`# a local mutate used for storing an error`
`42`	`42`	`# when throwing an exception`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ module:public duration (`
`38`	`38`	`#`
`39`	`39`	`public nanos u64`
`40`	`40`	`)`
`41`		`- : Period,`
	`41`	`+ : time.Period,`
`42`	`42`	`property.orderable,`
`43`	`43`	`property.hashable`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`# not be the right source of time to, e.g., feed an alarm clock that should`
`35`	`35`	`# wake you up at 6h30 every morning.`
`36`	`36`	`#`
`37`		`-public nano (p Nano_Time_Handler) : Clock is`
	`37`	`+public nano (p Nano_Time_Handler) : time.Clock is`
`38`	`38`
`39`	`39`	`# no guarantee can be given for precision nor resolution`
`40`	`40`	`#`
Original file line number	Diff line number	Diff line change
`@@ -717,12 +717,12 @@ boolean constraintAssignableFrom(Context context, AbstractType actual)`
`717`	`717`	`// NYI: BUG: Check: What about open generics?`
`718`	`718`	`result = actual.feature() == feature() &&`
`719`	`719`	`(actual.isThisType() \|\| (genericsAssignable(actual, context) &&`
`720`		`- (outer() == null \|\| actual.outer() != null && outer().constraintAssignableFrom(actual.outer()))));`
	`720`	`+ (outer() == null \|\| actual.outer() != null && outer().isAssignableFromDirectly(actual.outer()).yes())));`
`721`	`721`	`for (var p: actual.feature().inherits())`
`722`	`722`	`{`
`723`	`723`	`if (!result)`
`724`	`724`	`{`
`725`		`- var pa = p.type().applyTypePars(actual);`
	`725`	`+ var pa = actualType(p.type().applyTypePars(actual));`
`726`	`726`	`result = pa!=actual && constraintAssignableFrom(context, pa);`
`727`	`727`	`}`
`728`	`728`	`}`