Skip to content

Commit 95a8a9c

Browse files
authored
Introduce Best Effort compilation options (#17582)
This PR introduces 2 new experimental options: `-Ybest-effort` and `-Ywith-best-effort-tasty`. It also introduces the Best Effort TASTy format (BETASTy), a TASTy aligned file format able to hold some errored trees. Behaviour of the options and the format is documented as part of this PR in the `best-effort-compilation.md` docs file. `-Ybest-effort` allows to create .betasty files in a failing compilation, while `-Ywith-best-effort-tasty` allows to read them in subsequent compilations, so that we can get information needed for IDEs from broken modules, and modules depending on them. It is worth noting that these compilation depending on Betty will never reach transform phases, and will never produce any artifacts other then betasty and semanticdb. My overall aim was to be able to handle as many cases, with little as little maintainance necessary as possible. This is for example why pretty much the only required phases are Parser and Typer - they are enough for, as far as I know, all necessary metals completions and I did not find any issues with setting their products (best effort tasty files) as dependencies. Requiring, for example, PostTyper, would require for the errored trees to be able to somehow pass through that phase, meaning a large investment from me into working the existing known error cases through there (muddling the codebase in the process) and possibly from the maintainers working on both Typer (to be able to produce „correct” error trees) and PostTyper (to be able to consume „correct” errored trees), which would obviously make the entire initiative dreadful. This is also why any tests are able to be put into a blacklist file, in case something changes and a neg test will not pass, or a new test will be added as part of issue fix that does not play well with the best-effort features.
1 parent b93c337 commit 95a8a9c

File tree

61 files changed

+1202
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1202
-233
lines changed

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class GenBCode extends Phase { self =>
2121

2222
override def description: String = GenBCode.description
2323

24+
override def isRunnable(using Context) = super.isRunnable && !ctx.usedBestEffortTasty
25+
2426
private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]]
2527
def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = {
2628
val old = superCallsMap.getOrElse(sym, Set.empty)

compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class GenSJSIR extends Phase {
1212
override def description: String = GenSJSIR.description
1313

1414
override def isRunnable(using Context): Boolean =
15-
super.isRunnable && ctx.settings.scalajs.value
15+
super.isRunnable && ctx.settings.scalajs.value && !ctx.usedBestEffortTasty
1616

1717
def run(using Context): Unit =
1818
new JSCodeGen().run()

compiler/src/dotty/tools/dotc/Driver.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ class Driver {
3939
catch
4040
case ex: FatalError =>
4141
report.error(ex.getMessage.nn) // signals that we should fail compilation.
42+
case ex: Throwable if ctx.usedBestEffortTasty =>
43+
report.bestEffortError(ex, "Some best-effort tasty files were not able to be read.")
44+
throw ex
4245
case ex: TypeError if !runOrNull.enrichedErrorMessage =>
4346
println(runOrNull.enrichErrorMessage(s"${ex.toMessage} while compiling ${files.map(_.path).mkString(", ")}"))
4447
throw ex
@@ -102,8 +105,8 @@ class Driver {
102105
None
103106
else file.ext match
104107
case FileExtension.Jar => Some(file.path)
105-
case FileExtension.Tasty =>
106-
TastyFileUtil.getClassPath(file) match
108+
case FileExtension.Tasty | FileExtension.Betasty =>
109+
TastyFileUtil.getClassPath(file, ctx.withBestEffortTasty) match
107110
case Some(classpath) => Some(classpath)
108111
case _ =>
109112
report.error(em"Could not load classname from: ${file.path}")

compiler/src/dotty/tools/dotc/Run.scala

+9-1
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,13 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
329329
val profiler = ctx.profiler
330330
var phasesWereAdjusted = false
331331

332+
var forceReachPhaseMaybe =
333+
if (ctx.isBestEffort && phases.exists(_.phaseName == "typer")) Some("typer")
334+
else None
335+
332336
for phase <- allPhases do
333337
doEnterPhase(phase)
334-
val phaseWillRun = phase.isRunnable
338+
val phaseWillRun = phase.isRunnable || forceReachPhaseMaybe.nonEmpty
335339
if phaseWillRun then
336340
Stats.trackTime(s"phase time ms/$phase") {
337341
val start = System.currentTimeMillis
@@ -344,6 +348,10 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
344348
def printCtx(unit: CompilationUnit) = phase.printingContext(
345349
ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))
346350
lastPrintedTree = printTree(lastPrintedTree)(using printCtx(unit))
351+
352+
if forceReachPhaseMaybe.contains(phase.phaseName) then
353+
forceReachPhaseMaybe = None
354+
347355
report.informTime(s"$phase ", start)
348356
Stats.record(s"total trees at end of $phase", ast.Trees.ntrees)
349357
for (unit <- units)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -919,12 +919,12 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
919919
else cpy.PackageDef(tree)(pid, slicedStats) :: Nil
920920
case tdef: TypeDef =>
921921
val sym = tdef.symbol
922-
assert(sym.isClass)
922+
assert(sym.isClass || ctx.tolerateErrorsForBestEffort)
923923
if (cls == sym || cls == sym.linkedClass) tdef :: Nil
924924
else Nil
925925
case vdef: ValDef =>
926926
val sym = vdef.symbol
927-
assert(sym.is(Module))
927+
assert(sym.is(Module) || ctx.tolerateErrorsForBestEffort)
928928
if (cls == sym.companionClass || cls == sym.moduleClass) vdef :: Nil
929929
else Nil
930930
case tree =>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
4747
case _: RefTree | _: GenericApply | _: Inlined | _: Hole =>
4848
ta.assignType(untpd.Apply(fn, args), fn, args)
4949
case _ =>
50-
assert(ctx.reporter.errorsReported)
50+
assert(ctx.reporter.errorsReported || ctx.tolerateErrorsForBestEffort)
5151
ta.assignType(untpd.Apply(fn, args), fn, args)
5252

5353
def TypeApply(fn: Tree, args: List[Tree])(using Context): TypeApply = fn match
@@ -56,7 +56,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
5656
case _: RefTree | _: GenericApply =>
5757
ta.assignType(untpd.TypeApply(fn, args), fn, args)
5858
case _ =>
59-
assert(ctx.reporter.errorsReported, s"unexpected tree for type application: $fn")
59+
assert(ctx.reporter.errorsReported || ctx.tolerateErrorsForBestEffort, s"unexpected tree for type application: $fn")
6060
ta.assignType(untpd.TypeApply(fn, args), fn, args)
6161

6262
def Literal(const: Constant)(using Context): Literal =

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
285285
protected def createFileEntry(file: AbstractFile): BinaryFileEntry = BinaryFileEntry(file)
286286

287287
protected def isMatchingFile(f: JFile): Boolean =
288-
f.isTasty || (f.isClass && !f.hasSiblingTasty)
288+
f.isTasty || f.isBestEffortTasty || (f.isClass && !f.hasSiblingTasty)
289289

290290
private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
291291
}

compiler/src/dotty/tools/dotc/classpath/FileUtils.scala

+8
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ object FileUtils {
2323

2424
def hasTastyExtension: Boolean = file.ext.isTasty
2525

26+
def hasBetastyExtension: Boolean = file.ext.isBetasty
27+
2628
def isTasty: Boolean = !file.isDirectory && hasTastyExtension
2729

30+
def isBestEffortTasty: Boolean = !file.isDirectory && hasBetastyExtension
31+
2832
def isScalaBinary: Boolean = file.isClass || file.isTasty
2933

3034
def isScalaOrJavaSource: Boolean = !file.isDirectory && file.ext.isScalaOrJava
@@ -55,6 +59,9 @@ object FileUtils {
5559

5660
def isTasty: Boolean = file.isFile && file.getName.endsWith(SUFFIX_TASTY)
5761

62+
def isBestEffortTasty: Boolean = file.isFile && file.getName.endsWith(SUFFIX_BETASTY)
63+
64+
5865
/**
5966
* Returns if there is an existing sibling `.tasty` file.
6067
*/
@@ -69,6 +76,7 @@ object FileUtils {
6976
private val SUFFIX_CLASS = ".class"
7077
private val SUFFIX_SCALA = ".scala"
7178
private val SUFFIX_TASTY = ".tasty"
79+
private val SUFFIX_BETASTY = ".betasty"
7280
private val SUFFIX_JAVA = ".java"
7381
private val SUFFIX_SIG = ".sig"
7482

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

+3
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@ private sealed trait YSettings:
414414
val YprofileRunGcBetweenPhases: Setting[List[String]] = PhasesSetting(ForkSetting, "Yprofile-run-gc", "Run a GC between phases - this allows heap size to be accurate at the expense of more time. Specify a list of phases, or *", "_")
415415
//.withPostSetHook( _ => YprofileEnabled.value = true )
416416

417+
val YbestEffort: Setting[Boolean] = BooleanSetting(ForkSetting, "Ybest-effort", "Enable best-effort compilation attempting to produce betasty to the META-INF/best-effort directory, regardless of errors, as part of the pickler phase.")
418+
val YwithBestEffortTasty: Setting[Boolean] = BooleanSetting(ForkSetting, "Ywith-best-effort-tasty", "Allow to compile using best-effort tasty files. If such file is used, the compiler will stop after the pickler phase.")
419+
417420
// Experimental language features
418421
val YnoKindPolymorphism: Setting[Boolean] = BooleanSetting(ForkSetting, "Yno-kind-polymorphism", "Disable kind polymorphism.")
419422
val YexplicitNulls: Setting[Boolean] = BooleanSetting(ForkSetting, "Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")

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

+18
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,21 @@ object Contexts {
474474

475475
/** Is the flexible types option set? */
476476
def flexibleTypes: Boolean = base.settings.YexplicitNulls.value && !base.settings.YnoFlexibleTypes.value
477+
478+
/** Is the best-effort option set? */
479+
def isBestEffort: Boolean = base.settings.YbestEffort.value
480+
481+
/** Is the with-best-effort-tasty option set? */
482+
def withBestEffortTasty: Boolean = base.settings.YwithBestEffortTasty.value
483+
484+
/** Were any best effort tasty dependencies used during compilation? */
485+
def usedBestEffortTasty: Boolean = base.usedBestEffortTasty
486+
487+
/** Confirm that a best effort tasty dependency was used during compilation. */
488+
def setUsedBestEffortTasty(): Unit = base.usedBestEffortTasty = true
489+
490+
/** Is either the best-effort option set or .betasty files were used during compilation? */
491+
def tolerateErrorsForBestEffort = isBestEffort || usedBestEffortTasty
477492

478493
/** A fresh clone of this context embedded in this context. */
479494
def fresh: FreshContext = freshOver(this)
@@ -960,6 +975,9 @@ object Contexts {
960975
val sources: util.HashMap[AbstractFile, SourceFile] = util.HashMap[AbstractFile, SourceFile]()
961976
val files: util.HashMap[TermName, AbstractFile] = util.HashMap()
962977

978+
/** Was best effort file used during compilation? */
979+
private[core] var usedBestEffortTasty = false
980+
963981
// Types state
964982
/** A table for hash consing unique types */
965983
private[core] val uniques: Uniques = Uniques()

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

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ object DenotTransformers {
2828

2929
/** The transformation method */
3030
def transform(ref: SingleDenotation)(using Context): SingleDenotation
31+
32+
override def isRunnable(using Context) = super.isRunnable && !ctx.usedBestEffortTasty
3133
}
3234

3335
/** A transformer that only transforms the info field of denotations */

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,8 @@ object Denotations {
719719
ctx.runId >= validFor.runId
720720
|| ctx.settings.YtestPickler.value // mixing test pickler with debug printing can travel back in time
721721
|| ctx.mode.is(Mode.Printing) // no use to be picky when printing error messages
722-
|| symbol.isOneOf(ValidForeverFlags),
722+
|| symbol.isOneOf(ValidForeverFlags)
723+
|| ctx.tolerateErrorsForBestEffort,
723724
s"denotation $this invalid in run ${ctx.runId}. ValidFor: $validFor")
724725
var d: SingleDenotation = this
725726
while ({

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

+11-7
Original file line numberDiff line numberDiff line change
@@ -720,12 +720,16 @@ object SymDenotations {
720720
* TODO: Find a more robust way to characterize self symbols, maybe by
721721
* spending a Flag on them?
722722
*/
723-
final def isSelfSym(using Context): Boolean = owner.infoOrCompleter match {
724-
case ClassInfo(_, _, _, _, selfInfo) =>
725-
selfInfo == symbol ||
726-
selfInfo.isInstanceOf[Type] && name == nme.WILDCARD
727-
case _ => false
728-
}
723+
final def isSelfSym(using Context): Boolean =
724+
if !ctx.isBestEffort || exists then
725+
owner.infoOrCompleter match {
726+
case ClassInfo(_, _, _, _, selfInfo) =>
727+
selfInfo == symbol ||
728+
selfInfo.isInstanceOf[Type] && name == nme.WILDCARD
729+
case _ => false
730+
}
731+
else false
732+
729733

730734
/** Is this definition contained in `boundary`?
731735
* Same as `ownersIterator contains boundary` but more efficient.
@@ -2003,7 +2007,7 @@ object SymDenotations {
20032007
case p :: parents1 =>
20042008
p.classSymbol match {
20052009
case pcls: ClassSymbol => builder.addAll(pcls.baseClasses)
2006-
case _ => assert(isRefinementClass || p.isError || ctx.mode.is(Mode.Interactive), s"$this has non-class parent: $p")
2010+
case _ => assert(isRefinementClass || p.isError || ctx.mode.is(Mode.Interactive) || ctx.tolerateErrorsForBestEffort, s"$this has non-class parent: $p")
20072011
}
20082012
traverse(parents1)
20092013
case nil =>

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

+29-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.nio.channels.ClosedByInterruptException
77

88
import scala.util.control.NonFatal
99

10-
import dotty.tools.dotc.classpath.FileUtils.hasTastyExtension
10+
import dotty.tools.dotc.classpath.FileUtils.{hasTastyExtension, hasBetastyExtension}
1111
import dotty.tools.io.{ ClassPath, ClassRepresentation, AbstractFile }
1212
import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
1313

@@ -26,6 +26,7 @@ import parsing.JavaParsers.OutlineJavaParser
2626
import parsing.Parsers.OutlineParser
2727
import dotty.tools.tasty.{TastyHeaderUnpickler, UnpickleException, UnpicklerConfig, TastyVersion}
2828
import dotty.tools.dotc.core.tasty.TastyUnpickler
29+
import dotty.tools.tasty.besteffort.BestEffortTastyHeaderUnpickler
2930

3031
object SymbolLoaders {
3132
import ast.untpd.*
@@ -198,7 +199,7 @@ object SymbolLoaders {
198199
enterToplevelsFromSource(owner, nameOf(classRep), src)
199200
case (Some(bin), _) =>
200201
val completer =
201-
if bin.hasTastyExtension then ctx.platform.newTastyLoader(bin)
202+
if bin.hasTastyExtension || bin.hasBetastyExtension then ctx.platform.newTastyLoader(bin)
202203
else ctx.platform.newClassLoader(bin)
203204
enterClassAndModule(owner, nameOf(classRep), completer)
204205
}
@@ -261,7 +262,8 @@ object SymbolLoaders {
261262
(idx + str.TOPLEVEL_SUFFIX.length + 1 != name.length || !name.endsWith(str.TOPLEVEL_SUFFIX))
262263
}
263264

264-
def maybeModuleClass(classRep: ClassRepresentation): Boolean = classRep.name.last == '$'
265+
def maybeModuleClass(classRep: ClassRepresentation): Boolean =
266+
classRep.name.nonEmpty && classRep.name.last == '$'
265267

266268
private def enterClasses(root: SymDenotation, packageName: String, flat: Boolean)(using Context) = {
267269
def isAbsent(classRep: ClassRepresentation) =
@@ -416,34 +418,45 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
416418
}
417419

418420
class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
419-
421+
val isBestEffortTasty = tastyFile.hasBetastyExtension
420422
private val unpickler: tasty.DottyUnpickler =
421423
handleUnpicklingExceptions:
422424
val tastyBytes = tastyFile.toByteArray
423-
new tasty.DottyUnpickler(tastyFile, tastyBytes) // reads header and name table
425+
new tasty.DottyUnpickler(tastyFile, tastyBytes, isBestEffortTasty) // reads header and name table
424426

425427
val compilationUnitInfo: CompilationUnitInfo | Null = unpickler.compilationUnitInfo
426428

427-
def description(using Context): String = "TASTy file " + tastyFile.toString
429+
def description(using Context): String =
430+
if isBestEffortTasty then "Best Effort TASTy file " + tastyFile.toString
431+
else "TASTy file " + tastyFile.toString
428432

429433
override def doComplete(root: SymDenotation)(using Context): Unit =
430434
handleUnpicklingExceptions:
431-
checkTastyUUID()
432435
val (classRoot, moduleRoot) = rootDenots(root.asClass)
433-
unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource))
434-
if mayLoadTreesFromTasty then
435-
classRoot.classSymbol.rootTreeOrProvider = unpickler
436-
moduleRoot.classSymbol.rootTreeOrProvider = unpickler
436+
if (!isBestEffortTasty || ctx.withBestEffortTasty) then
437+
val tastyBytes = tastyFile.toByteArray
438+
unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource))
439+
if mayLoadTreesFromTasty || isBestEffortTasty then
440+
classRoot.classSymbol.rootTreeOrProvider = unpickler
441+
moduleRoot.classSymbol.rootTreeOrProvider = unpickler
442+
if isBestEffortTasty then
443+
checkBeTastyUUID(tastyFile, tastyBytes)
444+
ctx.setUsedBestEffortTasty()
445+
else
446+
checkTastyUUID()
447+
else
448+
report.error(em"Cannot read Best Effort TASTy $tastyFile without the ${ctx.settings.YwithBestEffortTasty.name} option")
437449

438450
private def handleUnpicklingExceptions[T](thunk: =>T): T =
439451
try thunk
440452
catch case e: RuntimeException =>
453+
val tastyType = if (isBestEffortTasty) "Best Effort TASTy" else "TASTy"
441454
val message = e match
442455
case e: UnpickleException =>
443-
s"""TASTy file ${tastyFile.canonicalPath} could not be read, failing with:
456+
s"""$tastyType file ${tastyFile.canonicalPath} could not be read, failing with:
444457
| ${Option(e.getMessage).getOrElse("")}""".stripMargin
445458
case _ =>
446-
s"""TASTy file ${tastyFile.canonicalPath} is broken, reading aborted with ${e.getClass}
459+
s"""$tastyFile file ${tastyFile.canonicalPath} is broken, reading aborted with ${e.getClass}
447460
| ${Option(e.getMessage).getOrElse("")}""".stripMargin
448461
throw IOException(message, e)
449462

@@ -460,6 +473,9 @@ class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
460473
// tasty file compiled by `-Yearly-tasty-output-write` comes from an early output jar.
461474
report.inform(s"No classfiles found for $tastyFile when checking TASTy UUID")
462475

476+
private def checkBeTastyUUID(tastyFile: AbstractFile, tastyBytes: Array[Byte])(using Context): Unit =
477+
new BestEffortTastyHeaderUnpickler(tastyBytes).readHeader()
478+
463479
private def mayLoadTreesFromTasty(using Context): Boolean =
464480
ctx.settings.YretainTrees.value || ctx.settings.fromTasty.value
465481
}

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,9 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
747747
assert(!etp.isInstanceOf[WildcardType] || inSigName, i"Unexpected WildcardType erasure for $tp")
748748
etp
749749

750-
/** Like translucentSuperType, but issue a fatal error if it does not exist. */
750+
/** Like translucentSuperType, but issue a fatal error if it does not exist.
751+
* If using the best-effort option, the fatal error will not be issued.
752+
*/
751753
private def checkedSuperType(tp: TypeProxy)(using Context): Type =
752754
val tp1 = tp.translucentSuperType
753755
if !tp1.exists then
@@ -756,7 +758,8 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
756758
MissingType(tycon.prefix, tycon.name)
757759
case _ =>
758760
TypeError(em"Cannot resolve reference to $tp")
759-
throw typeErr
761+
if ctx.isBestEffort then report.error(typeErr.toMessage)
762+
else throw typeErr
760763
tp1
761764

762765
/** Widen term ref, skipping any `()` parameter of an eventual getter. Used to erase a TermRef.

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -3149,7 +3149,8 @@ object Types extends TypeUtils {
31493149
if (ctx.erasedTypes) tref
31503150
else cls.info match {
31513151
case cinfo: ClassInfo => cinfo.selfType
3152-
case _: ErrorType | NoType if ctx.mode.is(Mode.Interactive) => cls.info
3152+
case _: ErrorType | NoType
3153+
if ctx.mode.is(Mode.Interactive) || ctx.tolerateErrorsForBestEffort => cls.info
31533154
// can happen in IDE if `cls` is stale
31543155
}
31553156

@@ -3719,8 +3720,9 @@ object Types extends TypeUtils {
37193720

37203721
def apply(tp1: Type, tp2: Type, soft: Boolean)(using Context): OrType = {
37213722
def where = i"in union $tp1 | $tp2"
3722-
expectValueTypeOrWildcard(tp1, where)
3723-
expectValueTypeOrWildcard(tp2, where)
3723+
if !ctx.usedBestEffortTasty then
3724+
expectValueTypeOrWildcard(tp1, where)
3725+
expectValueTypeOrWildcard(tp2, where)
37243726
assertUnerased()
37253727
unique(new CachedOrType(tp1, tp2, soft))
37263728
}

0 commit comments

Comments
 (0)