Skip to content

Commit 705ec4d

Browse files
committed
Change excludelist
1 parent d9f49d1 commit 705ec4d

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

compiler/src/dotty/tools/dotc/core/ImplicitNullInterop.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ object ImplicitNullInterop {
156156
// In all other cases, return the type unchanged.
157157
// In particular, if the type is a ConstantType, then we don't nullify it because it is the
158158
// type of a final non-nullable field.
159+
case tp: ExprType => mapOver(tp)
160+
case tp: AnnotatedType => mapOver(tp)
161+
case tp: OrType => mapOver(tp)
162+
case tp: MatchType => mapOver(tp)
159163
case _ => tp
160164
}
161165
}

compiler/test/dotc/neg-explicit-nulls-scala2-library-tasty.excludelist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ nn-basic.scala # .length flexified but trim rejected
55
i21380c.scala # .length flexified but replaceAll rejected
66
unsafe-scope.scala # .length flexified
77
i17467.scala # Singleton type flexified
8-
i7883.scala # Unsure
98
from-nullable.scala # Option argument flexified
109
flow-in-block.scala # .length flexified
1110
array.scala # Type arugment of Array flexified

tests/explicit-nulls/flexible-unpickle/Flexible_2.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ def Flexible_2() =
3535
val unsafe = new Unsafe_1()
3636
val s: String = unsafe.foo(s2)
3737
unsafe.foo("")
38-
unsafe.foo(null)
38+
unsafe.foo(null)
39+
40+
val refinement = new Unsafe_1 {val b: String}

tests/explicit-nulls/flexible-unpickle/Unsafe_1.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@ class Unsafe_1 {
1818
object Foo {
1919
def bar = "bar!"
2020
def id[T](t: T): T = t
21+
22+
}
23+
24+
class Constructors {
25+
2126
}

0 commit comments

Comments
 (0)