Skip to content

Commit e31661e

Browse files
committed
resolve merge confilct
1 parent cf753eb commit e31661e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

shared/src/main/scala/mlscript/TyperDatatypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ abstract class TyperDatatypes extends TyperHelpers { Typer: Typer =>
741741
} else N
742742
case (a: TupleType, b: RecordType) if pol => lcg(pol, a.toRecord, b)
743743
case (a: RecordType, b: RecordType) =>
744-
val default = FieldType(N, if (pol) TopType else BotType)(noProv)
744+
val default = FieldType(N, if (pol) TopType else BotType, false)(noProv)
745745
if (b.fields.map(_._1).forall(a.fields.map(_._1).contains)) {
746746
val u = a.fields.map {
747747
case (v, f) => lcgField(pol, f, b.fields.find(_._1 === v).fold(default)(_._2))

0 commit comments

Comments
 (0)