Pass length of source file to C parsing actions #261
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
|
@swift-ci Please test |
rintaro
reviewed
Mar 4, 2021
| @@ -192,7 +192,7 @@ public enum SyntaxParser { | |||
| swiftparse_parser_set_diagnostic_handler(c_parser, diagHandler) | |||
| } | |||
|
|
|||
| let c_top = swiftparse_parse_string(c_parser, source) | |||
| let c_top = swiftparse_parse_string(c_parser, source, source.utf8.count) | |||
There was a problem hiding this comment.
I believe passing String to const char * calls String.utf8CString which always copies the buffer. Probably
let c_top = source.withUTF8 {
$0.withMemoryRebound(to: CChar.self) { buf in
swiftparse_parse_string(c_parser, buf.baseAddress, buf.count)
}
}is faster unless it needs to be null terminated.
There was a problem hiding this comment.
It needs to be null-terminated, otherwise lvm::MemoryBuffer::getMemBuffer is not happy (also we need the terminating null char to lex it as the EOF token).
There was a problem hiding this comment.
OK, in that case, I suggest
let c_top = source.withCString { buf in
swiftparse_parse_string(c_parser, buf, source.utf8.count)
}withCString doesn't copy the buffer if the underlying string buffer is null terminated.
akyrtzi
approved these changes
Mar 4, 2021
Previously, the string was implicitly terminated by the first null character. But a source file might contain a null character which shouldn't terminate it.
ahoppen
force-pushed
the
pr/null-character-in-file
branch
from
af5448b to
cb72454
Compare
adevress
pushed a commit
to adevress/swift-syntax
that referenced
this pull request
Jan 14, 2024
…l-mode Fix and improve parallel mode
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.
Previously, the string was implicitly terminated by the first null character. But a source file might contain a null character which shouldn't terminate it.