Skip to content

Fix #2636: Move last phase period assertion #2952

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 3 commits into from
Aug 5, 2017
Merged

Fix #2636: Move last phase period assertion #2952

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b82a6f
Fix #2636: Move last phase period assertion
nicolasstucki Aug 3, 2017
8636508
Phases: test for too many phases
DarkDimius Aug 3, 2017
23aceb1
Remove duplicated asserion
nicolasstucki Aug 3, 2017
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
7 changes: 6 additions & 1 deletion compiler/src/dotty/tools/dotc/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,14 @@ class Compiler {
new CollectSuperCalls, // Find classes that are called with super
new DropInlined, // Drop Inlined nodes, since backend has no use for them
new LabelDefs), // Converts calls to labels to jumps
List(new GenBCode) // Generate JVM bytecode
List(checkedIdOverflow(new GenBCode)) // Generate JVM bytecode
)

private def checkedIdOverflow(phase: Phase): Phase = {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

assert(phase.id <= Periods.MaxPossiblePhaseId)
Copy link
Contributor

Choose a reason for hiding this comment

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

would this ever fail? Phase.id extracts it from the period inside the phase, i.e. it reads a field which you're supposedly testing for overflow.

Copy link
Contributor

Choose a reason for hiding this comment

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

I propose to do the test in Phase.init instead.

Copy link
Contributor

Choose a reason for hiding this comment

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

#2953

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know if it will ever fail, but that was the check that was there before. Probably at some point this was failing.

phase
}

var runId = 1
def nextRunId = {
runId += 1; runId
Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/dotc/Run.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import scala.util.control.NonFatal
/** A compiler run. Exports various methods to compile source files */
class Run(comp: Compiler)(implicit ctx: Context) {

assert(comp.phases.last.last.id <= Periods.MaxPossiblePhaseId)
assert(ctx.runId <= Periods.MaxPossibleRunId)

var units: List[CompilationUnit] = _
Expand Down