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

Move async-await tests from run-pass to ui #62270

Merged
merged 5 commits into from
Jul 11, 2019
Merged

Conversation

agnxy
Copy link
Contributor

@agnxy agnxy commented Jul 1, 2019

fix #62236

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 1, 2019
@tmandry

This comment has been minimized.

@agnxy

This comment has been minimized.

@Centril

This comment has been minimized.

@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 3, 2019
@Centril
Copy link
Contributor

Centril commented Jul 5, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit c1471bfb04e51b0295b355c9c59d5f514cbcc35b has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2019
@bors
Copy link
Contributor

bors commented Jul 5, 2019

☔ The latest upstream changes (presumably #62407) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 5, 2019
agnxy added 4 commits July 6, 2019 14:09
The auxiliary file arc_wake.rs is in run-pass/auxiliary and also
ui/async-await/auxiliary. Remove the former one as their contents
are same.
Move run-pass/futures-api.rs to ui/async-await/futures-api.rs as it
needs to use arc_wake.rs.
@Centril
Copy link
Contributor

Centril commented Jul 6, 2019

Thanks! @bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 6, 2019

📌 Commit f115147 has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
Rollup of 4 pull requests [2]

Successful merges:

 - rust-lang#59800 (rustc: Remove `dylib` crate type from most rustc crates)
 - rust-lang#60081 (Refactor unicode.py script)
 - rust-lang#62270 (Move async-await tests from run-pass to ui)
 - rust-lang#62281 (Add support for pc-relative addressing on 64-bit RISC-V)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
@Centril
Copy link
Contributor

Centril commented Jul 6, 2019

Failed in #62448 (comment), @bors r-

@tmandry Something fishy is going on tho..

failures:

---- [ui] ui/async-await/async-fn-size-moved-locals.rs stdout ----

error: test run failed!
status: exit code: 101
command: "/node-v9.2.0-linux-x64/bin/node" "/checkout/src/etc/wasm32-shim.js" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/async-fn-size-moved-locals/a.wasm"
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
RuntimeError: unreachable
    at __rust_start_panic (wasm-function[68]:1)
    at rust_panic (wasm-function[64]:39)
    at _ZN3std9panicking20rust_panic_with_hook17h2d6e43efc6bf77fdE (wasm-function[59]:346)
    at _ZN3std9panicking18continue_panic_fmt17h9016955e9027da33E (wasm-function[58]:151)
    at _ZN3std9panicking15begin_panic_fmt17h52d189e875ddbafaE (wasm-function[33]:108)
    at _ZN26async_fn_size_moved_locals4main17h2d699e92deec06acE (wasm-function[4]:144)
    at _ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17hdba8efe9f3805544E (wasm-function[1]:25)
    at _ZN3std10sys_common9backtrace28__rust_begin_short_backtrace17h4c4b5cb95474f728E (wasm-function[48]:8)
    at _ZN3std9panicking3try7do_call17hd33565ab64c5123fE (wasm-function[56]:20)
    at __rust_maybe_catch_panic (wasm-function[67]:5)
    at _ZN3std2rt19lang_start_internal17hb4e78568bfc14e3aE (wasm-function[65]:270)
    at main (wasm-function[5]:46)
    at Object.<anonymous> (/checkout/src/etc/wasm32-shim.js:126:20)
    at Module._compile (module.js:641:30)
    at Object.Module._extensions..js (module.js:652:10)
    at Module.load (module.js:560:32)
    at tryModuleLoad (module.js:503:12)
    at Function.Module._load (module.js:495:3)
    at Function.Module.runMain (module.js:682:10)
    at startup (bootstrap_node.js:191:16)

------------------------------------------

failures:
    [ui] ui/async-await/async-fn-size-moved-locals.rs

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 6, 2019
@tmandry
Copy link
Member

tmandry commented Jul 10, 2019

@Centril Yeah I'm able to reproduce, trying to figure out how to debug wasm currently...

@Mark-Simulacrum
Copy link
Member

FWIW I was able to reproduce as well, see some discussion/history on Zulip.

This snippet makes the test run fine on wasm I believe, so we probably just want to ignore the test (it looks like the sizes for wasm are different, probably due to some underlying struct -- here is a diff of -Zprint-type-sizes with i686-unknown-linux-gnu vs wasm32-unknown-unknown: https://gist.github.com/Mark-Simulacrum/cd7d2532c12f38584544e7b0ca07b4b6, but that seems to suggest that the difference is not in an underlying type but rather optimizations or how we do layout of generators...).

    assert_eq!(1028, std::mem::size_of_val(&single()));
    assert_eq!(1028, std::mem::size_of_val(&single_with_noop()));
    assert_eq!(3080, std::mem::size_of_val(&joined()));
    assert_eq!(3080, std::mem::size_of_val(&joined_with_noop()));

@Centril
Copy link
Contributor

Centril commented Jul 10, 2019

r? @tmandry

@rust-highfive rust-highfive assigned tmandry and unassigned Centril Jul 10, 2019
@tmandry
Copy link
Member

tmandry commented Jul 10, 2019

@agnxy The tests should pass with my suggestion applied.

The sizes for wasm are different.

Co-Authored-By: Tyler Mandry <tmandry@gmail.com>
@agnxy
Copy link
Contributor Author

agnxy commented Jul 10, 2019

Thanks a lot @tmandry and @Mark-Simulacrum I'm reading the zulip topic to learn about wasm.

@Centril
Copy link
Contributor

Centril commented Jul 10, 2019

@bors r=Centril,tmandry

@bors
Copy link
Contributor

bors commented Jul 10, 2019

📌 Commit 128143c has been approved by Centril,tmandry

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 10, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 11, 2019
…andry

Move async-await tests from run-pass to ui

fix rust-lang#62236

r? @Centril
bors added a commit that referenced this pull request Jul 11, 2019
Rollup of 7 pull requests

Successful merges:

 - #61665 (core: check for pointer equality when comparing Eq slices)
 - #61923 (Prerequisites from dep graph refactoring #2)
 - #62270 (Move async-await tests from run-pass to ui)
 - #62425 (filedesc: don't use ioctl(FIOCLEX) on Linux)
 - #62476 (Continue refactoring macro expansion and resolution)
 - #62519 (Regression test for HRTB bug (issue 30786).)
 - #62557 (Fix typo in libcore/intrinsics.rs)

Failed merges:

r? @ghost
@bors bors merged commit 128143c into rust-lang:master Jul 11, 2019
@agnxy agnxy deleted the move-async-test branch July 13, 2019 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move tests in src/test/run-pass/async-await -> src/test/ui/async-await
6 participants