Skip to content

Refine error messages for early promotion #15263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 25, 2022
+485 −437
Merged

Refine error messages for early promotion #15263

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a7e420
Don't chain promotion
liufengyun May 23, 2022
9a9db23
Refactor error reporting to stop on first error
liufengyun May 23, 2022
c1b83f6
Refine marker positions
liufengyun May 23, 2022
efb9776
Make TreeChecker happy
liufengyun May 23, 2022
a98076f
Clean up
liufengyun May 23, 2022
c1595c5
Organize code
liufengyun May 24, 2022
43553ea
Improve error message
liufengyun May 24, 2022
a4c78a4
Always show current class at the top of trace
liufengyun May 24, 2022
73e64a7
Fix missing stacktrace item
liufengyun May 25, 2022
7c12df0
Tweak message: make clear it is reassignment
liufengyun May 25, 2022
ce3c803
Address review comments
liufengyun May 25, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Address review comments
  • Loading branch information
@liufengyun
liufengyun committed May 25, 2022
commit ce3c803f71985a61eb8a9f0a89478f08cf62a632
19 changes: 10 additions & 9 deletions compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ object Semantic {
/** Error reporting */
trait Reporter:
def report(err: Error): Unit
def reportAll(errs: Seq[Error]): Unit = for err <- errs do report(err)

object Reporter:
class BufferedReporter extends Reporter:
Expand Down Expand Up @@ -600,7 +601,7 @@ object Semantic {
}

def call(meth: Symbol, args: List[ArgInfo], receiver: Type, superType: Type, needResolve: Boolean = true): Contextual[Value] = log("call " + meth.show + ", args = " + args, printer, (_: Value).show) {
def checkArgs = args.foreach(_.promote)
def promoteArgs(): Contextual[Unit] = args.foreach(_.promote)

def isSyntheticApply(meth: Symbol) =
meth.is(Flags.Synthetic)
Expand Down Expand Up @@ -648,16 +649,16 @@ object Semantic {
if allArgsPromote then
Hot: Value
else if errors.nonEmpty then
for error <- errors do reporter.report(error)
reporter.reportAll(errors)
Hot: Value
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the ascription needed?
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to a TreeChecker failure:

#15263 (comment)

I have no idea why the subtyping failed --- it shouldn't be.
else
Cold: Value
else
checkArgs
promoteArgs()
Hot

case Cold =>
checkArgs
promoteArgs()
val error = CallCold(meth, trace.toVector)
reporter.report(error)
Hot
Expand All @@ -676,15 +677,15 @@ object Semantic {
if target.hasSource then
val cls = target.owner.enclosingClass.asClass
val ddef = target.defTree.asInstanceOf[DefDef]
val argErrors = Reporter.errorsIn { args.foreach(_.promote) }
val argErrors = Reporter.errorsIn { promoteArgs() }
// normal method call
if argErrors.nonEmpty && isSyntheticApply(meth) then
val klass = meth.owner.companionClass.asClass
val outerCls = klass.owner.lexicallyEnclosingClass.asClass
val outer = resolveOuterSelect(outerCls, ref, 1)
outer.instantiate(klass, klass.primaryConstructor, args)
else
for error <- argErrors do reporter.report(error)
reporter.reportAll(argErrors)
withEnv(if isLocal then env else Env.empty) {
extendTrace(ddef) {
eval(ddef.rhs, ref, cls, cacheResult = true)
Expand All @@ -694,7 +695,7 @@ object Semantic {
Hot
else
// no source code available
checkArgs
promoteArgs()
val error = CallUnknown(target, trace.toVector)
reporter.report(error)
Hot
Expand All @@ -710,7 +711,7 @@ object Semantic {
// meth == NoSymbol for poly functions
if meth.name.toString == "tupled" then value // a call like `fun.tupled`
else
checkArgs
promoteArgs()
withEnv(env) {
eval(body, thisV, klass, cacheResult = true)
}
Expand Down Expand Up @@ -932,7 +933,7 @@ object Semantic {
promoted.add(warm)
val errors = warm.tryPromote(msg)
if errors.nonEmpty then promoted.remove(warm)
for error <- errors do reporter.report(error)
reporter.reportAll(errors)

case fun @ Fun(body, thisV, klass, env) =>
if !promoted.contains(fun) then
Expand Down