Skip to content

Commit 31f871c

Browse files
Merge pull request #14857 from dotty-staging/fix-5037
Tweak assertion in withMods
2 parents edc94c0 + c192ce4 commit 31f871c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

compiler/src/dotty/tools/dotc/ast/untpd.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,10 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
281281
else {
282282
if (ms.nonEmpty)
283283
for (m <- ms)
284-
assert(flags.isAllOf(m.flags) ||
285-
m.isInstanceOf[Mod.Private] && !privateWithin.isEmpty,
286-
s"unaccounted modifier: $m in $this when adding $ms")
284+
assert(flags.isAllOf(m.flags)
285+
|| m.isInstanceOf[Mod.Private] && !privateWithin.isEmpty
286+
|| (m.isInstanceOf[Mod.Abstract] || m.isInstanceOf[Mod.Override]) && flags.is(AbsOverride),
287+
s"unaccounted modifier: $m in $this with flags ${flags.flagsString} when adding $ms")
287288
copy(mods = ms)
288289
}
289290

tests/neg/i5037.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class Foo {
2+
abstract override var // error
3+
}

0 commit comments

Comments
 (0)