add fix for issue #17997 affecting the global object initialization c…

…hecker
scala · Jul 24, 2023 · f5313ae · f5313ae
1 parent 96ca0b6
commit f5313ae
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Objects.scala b/compiler/src/dotty/tools/dotc/transform/init/Objects.scala
@@ -1021,7 +1021,16 @@ object Objects:
         ref match
         case Select(supert: Super, _) =>
           val SuperType(thisTp, superTp) = supert.tpe: @unchecked
-          val thisValue2 = extendTrace(ref) { resolveThis(thisTp.classSymbol.asClass, thisV, klass) }
+          val thisValue2 = extendTrace(ref) {
+            thisTp match
+              case thisTp: ThisType =>
+                evalType(thisTp, thisV, klass)
+              case AndType(thisTp: ThisType, _) =>
+                evalType(thisTp, thisV, klass)
+              case _ =>
+                report.warning("[Internal error] Unexpected type " + thisTp.show + ", trace:\n" + Trace.show, ref)
+                Bottom
+          }
           withTrace(trace2) { call(thisValue2, ref.symbol, args, thisTp, superTp) }
 
         case Select(qual, _) =>