Skip to content

Fix #3853 and #4151: Compile code in the macro definition and remove interpreter #4155

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 5 commits into from
Mar 29, 2018
Merged

Fix #3853 and #4151: Compile code in the macro definition and remove interpreter #4155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4ddb5b
Fix #4151: Make sure the definition of the macro is correcty formed
nicolasstucki Mar 23, 2018
17fcc6d
Make sure inline macros are static methods
nicolasstucki Mar 26, 2018
54a1dcd
Fix #3853: Compile code in the macro definition and remove interpreter
nicolasstucki Mar 20, 2018
da8bbea
Add comment on Inlined call simplification
nicolasstucki Mar 28, 2018
ec164ff
Do not change stage of bindings
nicolasstucki Mar 28, 2018
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
222 changes: 0 additions & 222 deletions compiler/src/dotty/tools/dotc/interpreter/Interpreter.scala
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion compiler/src/dotty/tools/dotc/transform/PostTyper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,9 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
// be duplicated
// 2. To enable correct pickling (calls can share symbols with the inlined code, which
// would trigger an assertion when pickling).
val callTrace = Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
val callTrace =
if (call.symbol.is(Macro)) call
Copy link
Contributor

Choose a reason for hiding this comment

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

Why make the exception for macros? Since there is a reasoning in the comment above why we rewrite calls to callTraces, we need to add to the comment a reasoning why the same does not apply to macro calls.

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 will add a comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added the comment and making this optimization at ReifyQuotes when the call is processed.

else Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
cpy.Inlined(tree)(callTrace, transformSub(bindings), transform(expansion))
case tree: Template =>
withNoCheckNews(tree.parents.flatMap(newPart)) {
Expand Down
Loading