Check in companionPath doesn't accept case objects

travisbrown · travisbrown · commit 81ac68f1218a · 2020-01-28T07:54:04.000Z
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -909,7 +909,7 @@ trait Implicits { self: Typer =>
   /** A path referencing the companion of class type `clsType` */
   private def companionPath(clsType: Type, span: Span)(implicit ctx: Context) = {
     val ref = pathFor(clsType.companionRef)
-    assert(ref.symbol.is(Module) && ref.symbol.companionClass == clsType.classSymbol)
+    assert(ref.symbol.is(Module) && (clsType.classSymbol.is(ModuleClass) || (ref.symbol.companionClass == clsType.classSymbol)))
     ref.withSpan(span)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ trait Implicits { self: Typer =>`
`909`	`909`	/** A path referencing the companion of class type `clsType` */
`910`	`910`	`private def companionPath(clsType: Type, span: Span)(implicit ctx: Context) = {`
`911`	`911`	`val ref = pathFor(clsType.companionRef)`
`912`		`- assert(ref.symbol.is(Module) && ref.symbol.companionClass == clsType.classSymbol)`
	`912`	`+ assert(ref.symbol.is(Module) && (clsType.classSymbol.is(ModuleClass) \|\| (ref.symbol.companionClass == clsType.classSymbol)))`
`913`	`913`	`ref.withSpan(span)`
`914`	`914`	`}`
`915`	`915`