Skip to content

Update to nightly-2022-10-15 #954

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Nov 30, 2022
Merged

Update to nightly-2022-10-15 #954

merged 6 commits into from
Nov 30, 2022

Conversation

oisyn
Copy link
Contributor

@oisyn oisyn commented Nov 30, 2022 •
edited
Loading

The new fn_abi parameter in BuilderMethods::call() and invoke() scares me a bit. Here's the relevant PR in rust-lang

Tests pass and examples run.

With 2022-10-29 we're up to date for the new Rust 1.66 stable that's going to be released on Dec 15.

EDIT Back to 10-15 because of a blocked issue (diagnostic_output being removed from Config)

@oisyn oisyn requested a review from eddyb as a code owner November 30, 2022 13:14
@oisyn oisyn marked this pull request as draft November 30, 2022 13:20
@oisyn oisyn changed the title Update to nightly-2022-10-15 Update to nightly-2022-10-29 Nov 30, 2022
eddyb
eddyb suggested changes Nov 30, 2022
View reviewed changes
Copy link
Contributor

@eddyb eddyb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, the only addressable comment would be the one about not passing None (it might not matter now but we wouldn't want weird bugs in the future if we start relying on it).

EDIT: oops, you pushed the change in tests, which will definitely break at least 4 of them (try running cargo test -p rustc_codegen_spirv --lib to see what I mean).

crates/rustc_codegen_spirv/src/codegen_cx/entry.rs Outdated
bx.call(entry_func.ty, entry_func, &call_args, None);
bx.call(entry_func.ty, None, entry_func, &call_args, None);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can pass Some if you change this function (shader_entry_stub) to take the whole FnAbi (and call it entry_fn_abi) instead of arg_abis (which is the .args field of that very FnAbi).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened here? I see thumbs up but also marked as resolved and no change?

@oisyn oisyn changed the title Update to nightly-2022-10-29 Update to nightly-2022-10-15 Nov 30, 2022
@oisyn oisyn marked this pull request as ready for review November 30, 2022 14:31
@oisyn oisyn requested review from fu5ha and VZout as code owners November 30, 2022 14:31
@oisyn oisyn requested review from eddyb and removed request for fu5ha and VZout November 30, 2022 14:31
@oisyn oisyn enabled auto-merge (rebase) November 30, 2022 14:33
eddyb
eddyb suggested changes Nov 30, 2022
View reviewed changes
Copy link
Contributor

@eddyb eddyb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks ready but I'm not sure if you want to pass Some(entry_fn_abi) from that entry.rs function or not.

crates/rustc_codegen_spirv/src/codegen_cx/entry.rs Outdated
bx.call(entry_func.ty, entry_func, &call_args, None);
bx.call(entry_func.ty, None, entry_func, &call_args, None);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened here? I see thumbs up but also marked as resolved and no change?

@eddyb
Copy link
Contributor

eddyb commented Nov 30, 2022

EDIT Back to 10-15 because of a blocked issue (diagnostic_output being removed from Config)

Opened a PR to move us off of diagnostic_output:

@oisyn
Copy link
Contributor Author

oisyn commented Nov 30, 2022

Apparently forgot to use the param in the actual call 😬

@oisyn oisyn requested a review from eddyb November 30, 2022 17:21
@oisyn oisyn merged commit ccf920d into main Nov 30, 2022
@oisyn oisyn deleted the new-version branch November 30, 2022 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oisyn @eddyb