[SourceLocation] Extract and rework line tables #2900
Conversation
rintaro
force-pushed
the
linetables-sourceloc
branch
from
e430317 to
3848831
Compare
|
@swift-ci Please test |
|
@swift-ci Please test |
rintaro
force-pushed
the
linetables-sourceloc
branch
from
3848831 to
74765fd
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
| public var fileName: String | ||
| /// Line number offset from the physical line number. | ||
| public var lineOffset: Int | ||
| /// The position of the filename literal. |
There was a problem hiding this comment.
Could you elaborate what fileNamePosition is, maybe with an example? It’s not immediately clear to me.
There was a problem hiding this comment.
For example, for #sourceLocation(file: "input", line: 12), fileNamePosition is the position of "input". This is needed by the compiler to diagnose them later in the compiler. See https://github.com/swiftlang/swift/blob/50175c7e41120facbea67fc57af810e15f646675/test/ASTGen/sourcelocation.swift#L28-L39
There was a problem hiding this comment.
Would you mind adding a comment for that?
|
|
||
| extension SortedArray: Sendable where Element: Sendable {} | ||
|
|
||
| /// Represent a virtual file region in the source file. |
There was a problem hiding this comment.
Could you give an example what virtual files are used for here? Does #sourceLocation create a virtual file or are virtual files for macro expansions etc.?
There was a problem hiding this comment.
VirtualFile corresponds to swift::SourceManager::VirtualFile
This will be used for populating swift::SourceManager's table see swiftlang/swift#77721
There was a problem hiding this comment.
I think a doc comment would be helpful for this.
rintaro
force-pushed
the
linetables-sourceloc
branch
from
74765fd to
1250cfd
Compare
|
@swift-ci Please test |
|
@swift-ci Please smoke test |
* `computeLines` now produces newly introducded 'SourceLineTable'. * `SourceLineTable` is factored out line tables and `#sourceLocation` directive info, extracted from `SourceLocationConverter`. * `forEachLineLength` is now `forEachEndOfLine` which emits the absolute position of each end-of-line, instead of the line length, because the caller can easily derive the start-of-line position (i.e. the last end-of-line). * `#sourceLocation` info are now handled differently. Specifically, while traversing the syntax tree, it only collects the raw syntax, then post-process those info to produce the newly introduced `VirtualFile`. `VirtualFile` is a type that have enough infomation for `swift::SourceMamanger` in the compiler. Post-processing is needed because we want the start position of the _next_ line of the end of `#sourceLocation` directive, which might still not available when the first pass sees the directive. * In the future, the compiler shoud only use `SourceLineTable` instead of `SourceLocationConverter` as `swift::SourceManager` already know the file name and the whole source buffer.
rintaro
force-pushed
the
linetables-sourceloc
branch
from
1250cfd to
42cff3a
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
|
@swift-ci Please test |
computeLinesnow produces newly introducded 'SourceLineTable'.SourceLineTableis factored out line tables and#sourceLocationdirective info, extracted fromSourceLocationConverter.forEachLineLengthis nowforEachEndOfLinewhich emits the absolute position of each end-of-line, instead of the line length, because the caller can easily derive the start-of-line position (i.e. the last end-of-line).#sourceLocationinfo are now handled differently. Specifically, while traversing the syntax tree, it only collects the raw syntax, then post-process those info to produce the newly introducedVirtualFile.VirtualFileis a type that have enough infomation forswift::SourceMamangerin the compiler. Post-processing is needed because we want the start position of the next line of the end of#sourceLocationdirective, which might still not available when the first pass sees the directive.SourceLineTableinstead ofSourceLocationConverterasswift::SourceManageralready know the file name and the whole source buffer.No significant performance change by this.
before:
after