Set Span for top level annotations generated in PostTyper #16378
Conversation
This should help avoid macros throwing assertion errors in the case of annotations not having assigned Spans/positions. Since the annotation is generated and does not have a position corresponding to the source file, it inherits Span from the tree to which it is assigned.
jchyb
force-pushed
the
fix-16318
branch
4 times, most recently
from
cc74d95 to
db5b398
Compare
|
Hi @nicolasstucki apologies for being so late with this. I was not entirely sure on what you meant in the above comment, so in the end I decided to add two commits. The first one fixes the issue by adding spans to all generated annotations in PostTyper, like before. This alone fixes the #16318, and adds annotations to two additional places where the issue has a chance to reappear (so this includes every annotation generated in PostTyper). In the second commit, I make sure to add the span to every generated annotation in the compiler. For that I adjusted Annotation.apply methods to always require a span argument. This was obviously helpful for me, as it allowed me to easily locate span-less Annotations, and hopefully will be for others later, even if it is not futureproof (one can still pass a NoSpan, if necessary, in general it’s meant to be more of a remainder). However, if the contents of the second commit end up being unnecessary, I can easily remove it from the PR and we can proceed with just the first commit. |
compiler/test/dotty/tools/dotc/transform/TypeTestsCastsTest.scala
Outdated
Show resolved
Hide resolved
The contents of the second commit are necessary. That is what I felt was missing before. |
Achieved by removing the apply methods without a span argument, which would generate Annotation trees with empty spans. One can still put NoSpan as the span argument, so this will not make much of a difference, but will hopefully provide an additional incentive to always add one.
|
Thank you for the review! I also just realized I @ the wrong person in my comment above before, for which I apologize, should be edited correctly now |
This should help avoid macros throwing assertion errors in the case of annotations not having assigned Spans/positions. Since the annotation is generated and does not have a position corresponding to the source file, it inherits Span from the tree to which it is assigned.
Fixes #16318