Skip to content
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.

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

Rollup of 9 pull requests #104256

Closed
wants to merge 27 commits into from
Closed

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eholk and others added 27 commits October 10, 2022 16:00
Add lots of comments to this test and enable parts of the test that were
added but never ran.

Signed-off-by: David Wood <[email protected]>
`CompiledModule` should not think a DWARF object was emitted when a
bitcode-only compilation has happened, this can confuse archive file
creation (which expects to create an archive containing non-existent dwo
files).

Signed-off-by: David Wood <[email protected]>
This allows retrying binding TCP Socket multiple times. This is useful
when using emulators as network might not be available in the beginning.
This was orignally implemented in rust-lang#100316

Signed-off-by: Ayush Singh <[email protected]>
Previously, a `delay_span_bug` was isssued, failing normalization. This
create a `TyKind::Error` in the signature, which caused
`compare_predicate_entailment` to swallow its signature mismatch error,
causing ICEs because no error was emitted.
This patch allows the usage of the `track_caller` annotation on
generators, as well as sets them conditionally if the parent also has
`track_caller` set.

Also add this annotation on the `GenFuture`'s `poll()` function.
…elwoerister

llvm: dwo only emitted when object code emitted

Fixes rust-lang#103932.

`CompiledModule` should not think a DWARF object was emitted when a bitcode-only compilation has happened, this can confuse archive file creation (which expects to create an archive containing non-existent dwo files).

r? `@michaelwoerister`
prevent uninitialized access in black_box for zero-sized-types

Don't read the pointer location in black_box for zero sized types, just emit a memory clobber instead. Addresses  rust-lang#103304 when rust is build against LLVM at HEAD.

Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/.28with.20llvm.20at.20HEAD.29.3A.20msan.20error.20in.20core.3A.3Ahint.3A.3Ablack_box
…ckh726

Mark `trait_upcasting` feature no longer incomplete.

This marks the `trait_upcasting` feature no longer incomplete since rust-lang#101336 has been settled for a little while.

r? `@jackh726`
…n514

Retry binding TCP Socket in remote-test-server

This allows retrying binding TCP Socket multiple times. This is useful when using emulators as network might not be available in the beginning.

This was orignally implemented in rust-lang#100316

Signed-off-by: Ayush Singh <[email protected]>
Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more

r? `@lcnr`
…iler-errors

Emit error in `collecting_trait_impl_trait_tys` on mismatched signatures

Previously, a `delay_span_bug` was isssued, failing normalization. This create a `TyKind::Error` in the signature, which caused `compare_predicate_entailment` to swallow its signature mismatch error, causing ICEs because no error was emitted.

fixes rust-lang#104183

r? `@compiler-errors`
… r=eholk

Support `#[track_caller]` on async fns

Adds `#[track_caller]` to the generator that is created when we desugar the async fn.

Fixes rust-lang#78840

Open questions:
- What is the performance impact of adding `#[track_caller]` to every `GenFuture`'s `poll(...)` function, even if it's unused (i.e., the parent span does not set `#[track_caller]`)? We might need to set it only conditionally, if the indirection causes overhead we don't want.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 10, 2022
@rustbot rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 10, 2022
@Manishearth
Copy link
Member Author

@bors r+ p=5 rollup

@bors
Copy link
Contributor

bors commented Nov 10, 2022

📌 Commit c4561fc has been approved by Manishearth

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 10, 2022
@bors
Copy link
Contributor

bors commented Nov 10, 2022

⌛ Testing commit c4561fc with merge eed1f34659ccf23f36a4e8a1f8d73c3534da06bd...

@bors
Copy link
Contributor

bors commented Nov 10, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 10, 2022
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] src/test/ui/async-await/track-caller/panic-track-caller.rs stdout ----

error: test run failed!
status: exit status: 101
command: "/node-v15.14.0-linux-x64/bin/node" "/checkout/src/etc/wasm32-shim.js" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/track-caller/panic-track-caller/a.wasm"
stdout: none
--- stderr -------------------------------
RuntimeError: unreachable
    at __rust_start_panic (<anonymous>:wasm-function[94]:0x5a97)
    at rust_panic (<anonymous>:wasm-function[91]:0x5a5d)
    at _ZN3std9panicking20rust_panic_with_hook17h0c233e78e6112adfE (<anonymous>:wasm-function[90]:0x5a2d)
    at _ZN3std9panicking19begin_panic_handler28_$u7b$$u7b$closure$u7d$$u7d$17hf994fd019a2fd642E (<anonymous>:wasm-function[77]:0x4a54)
    at _ZN3std10sys_common9backtrace26__rust_end_short_backtrace17ha238eeecdfc892b1E (<anonymous>:wasm-function[76]:0x49b9)
    at rust_begin_unwind (<anonymous>:wasm-function[85]:0x5681)
    at _ZN4core9panicking9panic_fmt17ha1487ae10087c69cE (<anonymous>:wasm-function[140]:0x63bf)
    at _ZN4core9panicking5panic17heb919bbe7cf670eaE (<anonymous>:wasm-function[143]:0x680c)
    at _ZN3std5panic12catch_unwind17h79eba0ed8ab51e6aE (<anonymous>:wasm-function[2]:0x230)
    at _ZN18panic_track_caller4main17h0fa14fb0b64e685eE (<anonymous>:wasm-function[14]:0x66a)
    at _ZN3std10sys_common9backtrace28__rust_begin_short_backtrace17h363919328fe77852E (<anonymous>:wasm-function[0]:0x1cf)
    at _ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h226d7bc4ae73ce06E (<anonymous>:wasm-function[1]:0x1f1)
    at _ZN3std2rt19lang_start_internal17h8bbe173c9dd6e6e6E (<anonymous>:wasm-function[64]:0x3f60)
    at main (<anonymous>:wasm-function[15]:0x6b2)
    at Object.<anonymous> (/checkout/src/etc/wasm32-shim.js:20:20)
    at Module._compile (node:internal/modules/cjs/loader:1092:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1121:10)
    at Module.load (node:internal/modules/cjs/loader:972:32)
    at Function.Module._load (node:internal/modules/cjs/loader:813:14)
    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:76:12)



failures:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.