Merge pull request #14857 from dotty-staging/fix-5037

Tweak assertion in withMods
scala · Apr 7, 2022 · 31f871c · 31f871c
2 parents edc94c0 + c192ce4
commit 31f871c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/compiler/src/dotty/tools/dotc/ast/untpd.scala b/compiler/src/dotty/tools/dotc/ast/untpd.scala
@@ -281,9 +281,10 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
       else {
         if (ms.nonEmpty)
           for (m <- ms)
-            assert(flags.isAllOf(m.flags) ||
-                   m.isInstanceOf[Mod.Private] && !privateWithin.isEmpty,
-                   s"unaccounted modifier: $m in $this when adding $ms")
+            assert(flags.isAllOf(m.flags)
+                || m.isInstanceOf[Mod.Private] && !privateWithin.isEmpty
+                || (m.isInstanceOf[Mod.Abstract] || m.isInstanceOf[Mod.Override]) && flags.is(AbsOverride),
+                s"unaccounted modifier: $m in $this with flags ${flags.flagsString} when adding $ms")
         copy(mods = ms)
       }
 

diff --git a/tests/neg/i5037.scala b/tests/neg/i5037.scala
@@ -0,0 +1,3 @@
+class Foo {
+abstract override var // error
+}