Use inline flag instead of @inline annotation #1677
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
Convert `@inline` annotations to `inline` flags, not the other way round as was done before.
smarter
requested changes
Nov 7, 2016
| is(Method, butNot = Accessor) && | ||
| !isCompleting && // don't force method type; recursive inlines are ignored anyway. | ||
| hasAnnotation(defn.InlineAnnot) | ||
| def isInlineMethod(implicit ctx: Context): Boolean = is(InlineMethod, butNot = Accessor) |
There was a problem hiding this comment.
Is the butNot still necessary? Do accessors get the inline flag too somehow?
There was a problem hiding this comment.
They might if we have an accessor of an inline val. Better play it safe.
| @@ -521,6 +521,7 @@ class Namer { typer: Typer => | |||
| mergeCompanionDefs() | |||
| val ctxWithStats = (ctx /: stats) ((ctx, stat) => indexExpanded(stat)(ctx)) | |||
| createCompanionLinks(ctxWithStats) | |||
| //stats foreach enterAnnotations | |||
| addInlineInfo(denot, original) | ||
| if (cls == defn.InlineAnnot && denot.is(Method, butNot = Accessor)) | ||
| denot.setFlag(Inline) | ||
| if (denot.isInlineMethod) addInlineInfo(denot, original) |
There was a problem hiding this comment.
This means that addInlineInfo will be called for every annotation if the method is marked inline, previously hasInlineAnnot prevented that.
|
Merging now, because there's more to come... |
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.
Convert
@inlineannotations toinlineflags, not theother way round as was done before.
This is the first step to fixing #1647, which requires a reorganization how
annotations are handled.
I wanted to get the irregular treatement of inline annotations out of the way before trying this.
Review by @smarter. Feel free to cherry-pick for getting the new repo structure to work.