Rollup of 7 pull requests #62428
Merged
Rollup of 7 pull requests #62428
Conversation
This file contains 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
This bumps our linked OpenSSL version from 1.1.1a to 1.1.1c, picking up some various bug fixes and minor security issue fixes.
The reader itself doesn't need ability to peek tokens, so it's better if clients implement this functionality. This hopefully becomes especially easy once we use iterator interface for lexer, but this is not too easy at the moment, because of buffered errors.
…ooks This is needed to avoid doing unnecessary global alloc_map lookups
…determined by the machine instance. So far, however, calling such a function will fail.
…prove the error that actually gets shown a bit
…-Simulacrum Update linked OpenSSL version This bumps our linked OpenSSL version from 1.1.1a to 1.1.1c, picking up some various bug fixes and minor security issue fixes.
…kmdavis Miri engine: support extra function (pointer) values We want to add basic support for `dlsym` in Miri (needed to run the latest version of `getrandom`). For that to work, `dlsym` needs to return *something* that can be stored in a function pointer and later called. So we add a new `ExtraFnVal` type to the `Machine` trait, and enable Miri's memory to associate allocation IDs with such values, so that `create_fn_alloc` and `get_fn` can work on *both* `Instance` (this is used for "normal" function pointers) and `ExtraFnVal`. Cc @oli-obk
forward read_c_str method from Memory to Alloc This is more convenient to call when one starts with a `Scalar` (which is the common case). `read_c_str` is only used in Miri.
Fix perf regression from Miri Machine trait changes Maybe this fixes the perf regression that rust-lang#62003 seemingly introduced? Cc @nnethercote
request at least ptr-size alignment from posix_memalign Fixes rust-lang#62251
Remove support for 1-token lookahead from the lexer `StringReader` maintained `peek_token` and `peek_span_src_raw` for look ahead. `peek_token` was used only by rustdoc syntax coloring. After moving peeking logic into highlighter, I was able to remove `peek_token` from the lexer. I tried to use `iter::Peekable`, but that wasn't as pretty as I hoped, due to buffered fatal errors. So I went with hand-rolled peeking. After that I've noticed that the only peeking behavior left was for raw tokens to test tt jointness. I've rewritten it in terms of trivia tokens, and not just spans. After that it became possible to simplify the awkward constructor of the lexer, which could return `Err` if the first peeked token contained error.
Add test for ICE rust-lang#62375 Fixes rust-lang#62375
|
@bors r+ p=7 rollup=never |
|
📌 Commit 46edb51 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 46edb51 with merge 60f4f4ec0c4a883ff0de263594d25a036cb06f85... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
@bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 6, 2019
Rollup of 7 pull requests Successful merges: - #62151 (Update linked OpenSSL version) - #62245 (Miri engine: support extra function (pointer) values) - #62257 (forward read_c_str method from Memory to Alloc) - #62264 (Fix perf regression from Miri Machine trait changes) - #62296 (request at least ptr-size alignment from posix_memalign) - #62329 (Remove support for 1-token lookahead from the lexer) - #62377 (Add test for ICE #62375) Failed merges: r? @ghost
|
☀️ Test successful - checks-azure, checks-travis, status-appveyor |
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.
Successful merges:
Failed merges:
r? @ghost