Skip to content

Fix another NPE when compiling under -Yno-imports #1904

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 1 commit into from
Jan 16, 2017
Merged

Fix another NPE when compiling under -Yno-imports #1904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions compiler/src/dotty/tools/dotc/typer/Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,17 @@ object Implicits {
if (monitored) record(s"elided eligible refs", elided(this))
eligibles
case None =>
val savedEphemeral = ctx.typerState.ephemeral
ctx.typerState.ephemeral = false
try {
val result = computeEligible(tp)
if (ctx.typerState.ephemeral) record("ephemeral cache miss: eligible")
else eligibleCache(tp) = result
result
if (ctx eq NoContext) Nil
else {
val savedEphemeral = ctx.typerState.ephemeral
ctx.typerState.ephemeral = false
try {
val result = computeEligible(tp)
if (ctx.typerState.ephemeral) record("ephemeral cache miss: eligible")
else eligibleCache(tp) = result
result
} finally ctx.typerState.ephemeral |= savedEphemeral
}
finally ctx.typerState.ephemeral |= savedEphemeral
}
}

Expand Down