StringContextClass -> Module

Author: Wojtechnology

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

@@ -575,6 +575,7 @@ class Definitions {
 
   lazy val StringContextType: TypeRef       = ctx.requiredClassRef("scala.StringContext")
   def StringContextClass(implicit ctx: Context) = StringContextType.symbol.asClass
+  def StringContextModule(implicit ctx: Context) = StringContextClass.companionClass
 
   lazy val PartialFunctionType: TypeRef         = ctx.requiredClassRef("scala.PartialFunction")
   def PartialFunctionClass(implicit ctx: Context) = PartialFunctionType.symbol.asClass

compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala

@@ -21,8 +21,7 @@ class StringInterpolatorOpt extends MiniPhase {
       tree match {
         case Apply(Select(Apply(Select(ident, nme.apply), List(SeqLiteral(strs, _))), fn),
             List(SeqLiteral(elems, _))) =>
-          val clsSym = ident.symbol.companionClass
-          if (clsSym.eq(defn.StringContextClass) && strs.forall(_.isInstanceOf[Literal])
+          if (ident.symbol.eq(defn.StringContextModule) && strs.forall(_.isInstanceOf[Literal])
               && elems.length == strs.length - 1) {
             if (fn == nme.raw_) Some(strs, elems)
             else if (fn == nme.s) {