Fix #1605: don't inline methods that have errors #1607
Merged
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
|
nice title. |
felixmulder
changed the title
|
It inlined it ;) |
felixmulder
force-pushed
the
topic/fix-inline-untyped
branch
from
9fff5e9 to
678f2b7
Compare
|
I think I would put the check at the place where we call |
felixmulder
force-pushed
the
topic/fix-inline-untyped
branch
2 times, most recently
from
50b99e4 to
f0cfb25
Compare
|
@smarter - done |
felixmulder
force-pushed
the
topic/fix-inline-untyped
branch
from
f0cfb25 to
5176b04
Compare
odersky
reviewed
Nov 7, 2016
| @@ -191,7 +191,9 @@ object Inliner { | |||
| sym.updateAnnotation(LazyBodyAnnotation { _ => | |||
| implicit val ctx: Context = inlineCtx | |||
| val tree1 = treeExpr(ctx) | |||
There was a problem hiding this comment.
Better use reporter.errorCount
felixmulder
force-pushed
the
topic/fix-inline-untyped
branch
from
5176b04 to
1fec582
Compare
felixmulder
commented
Nov 7, 2016
| @@ -190,8 +190,7 @@ object Inliner { | |||
| val inlineCtx = ctx | |||
| sym.updateAnnotation(LazyBodyAnnotation { _ => | |||
| implicit val ctx: Context = inlineCtx | |||
| val tree1 = treeExpr(ctx) | |||
| makeInlineable(tree1) | |||
| ctx.withNoError(treeExpr(ctx))(makeInlineable) | |||
There was a problem hiding this comment.
@odersky - updated with your suggestion
|
LGTM |
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.
Review: @smarter