Ensure we register a cycle if we've got scala sources but pipelining is disabled #1511
Conversation
|
THIS SOFTWARE IS CONTRIBUTED SUBJECT TO THE TERMS OF THE Organization Contribution License Agreement v2.0, dated July 13, 2012.THIS SOFTWARE IS LICENSED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE MAY BE REDISTRIBUTED TO OTHERS ONLY BY EFFECTIVELY USING THIS OR ANOTHER EQUIVALENT DISCLAIMER IN ADDITION TO ANY OTHER REQUIRED LICENSE TERMS. |
ephemerist
force-pushed
the
feature/cycles-registration
branch
from
6dcfc62 to
ab5dab3
Compare
|
Getting a 500 error trying to sign the Scala CLA |
I reported it |
ephemerist
force-pushed
the
feature/cycles-registration
branch
from
ab5dab3 to
7fec355
Compare
Thanks. Scala CLA now complete. |
|
Thanks for the contribution. While this is fresh to you, could you retroactively create an issue describing the bug you're fixing here? |
Added as #1512 - let me know if you'd like any more detail. |
| @@ -70,14 +70,15 @@ object Incremental { | |||
| * Merge latest analysis as of pickling into pruned previous analysis, compute invalidations | |||
| * and decide whether we need another cycle. | |||
| */ | |||
| def mergeAndInvalidate(partialAnalysis: Analysis, completingCycle: Boolean): CompileCycleResult | |||
| def mergeAndInvalidate(partialAnalysis: Analysis, registerCycle: Boolean): CompileCycleResult | |||
There was a problem hiding this comment.
nit: consider renaming this to something like shouldRegisterCycle since def registerCycle exists, which this flag is encouraging the implementer to later call.
|
|
||
| /** | ||
| * Merge latest analysis as of analyzer into pruned previous analysis and inform file manager. | ||
| */ | ||
| def completeCycle( | ||
| prev: Option[CompileCycleResult], | ||
| partialAnalysis: Analysis | ||
| partialAnalysis: Analysis, | ||
| registerCycle: Boolean |
| incHandlerOpt foreach { incHandler => | ||
| if (earlyOutput.isDefined && incHandler.isFullCompilation) { | ||
| val a = getAnalysis | ||
| val CompileCycleResult(continue, invalidations, merged) = | ||
| incHandler.mergeAndInvalidate(a, false) | ||
| incHandler.mergeAndInvalidate(a, true) |
There was a problem hiding this comment.
to avoid boolean blindness, could we add parameterName = true here plz?
ephemerist
force-pushed
the
feature/cycles-registration
branch
2 times, most recently
from
065c3a8 to
6c520f5
Compare
ephemerist
force-pushed
the
feature/cycles-registration
branch
from
6c520f5 to
f032a9a
Compare
|
@eed3si9n thanks for the review - I've addressed all your comments. Not sure why Scala CLA is still failing - I clicked the link and it says |
Seems the checker doesn't follow redirects. #1513 |
No description provided.