Fix #2636: assert in Run.scala is inefficient #2640
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move the assert after the declaration of the phases. Tested: Compiled one program and nothing blew up.
DarkDimius
suggested changes
May 31, 2017
| @@ -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) | |||
There was a problem hiding this comment.
New runs are rarely created, this is not a performance critical place
There was a problem hiding this comment.
Ok, this isn't needed then.
| @@ -109,6 +109,9 @@ class Compiler { | |||
| new LabelDefs), // Converts calls to labels to jumps | |||
| List(new GenBCode) // Generate JVM bytecode | |||
| ) | |||
| assert(allPhases.last.last.id <= Periods.MaxPossiblePhaseId) | |||
There was a problem hiding this comment.
The idea is that compiler plugins may (in future) override\filter\change phases somehow. This means that this is wrong place to test the phase-plan, because it may still change. Phases have not been combine or initialized.
Additionally, Transforms require their own periods, and they will not be set here.
There was a problem hiding this comment.
+ are phase ids set here at all? isn't allPhases.last.last.id not yet initialized here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move the assert after the declaration of the phases.
Tested:
Compiled one program and nothing blew up.