Make `promote_consts` emit the errors when required promotion fails #65946

ecstatic-morse · 2019-10-29T20:13:40Z

A very minimal version of #65942.

This will cause a generic "argument X is required to be a constant" message for simd_shuffle LLVM intrinsics instead of the custom one. It may be possible to remove this special-casing altogether after rust-lang/stdarch#825.

r? @eddyb

src/librustc_mir/transform/promote_consts.rs

eddyb · 2019-10-29T20:24:27Z

src/librustc_mir/transform/promote_consts.rs

@@ -360,8 +369,6 @@ impl<'tcx> Validator<'_, 'tcx> {
                }
            },
            Candidate::Argument { bb, index } => {
-                assert!(self.explicit);
-
                let terminator = self.body[bb].terminator();
                match &terminator.kind {
                    TerminatorKind::Call { args, .. } => {


I guess you didn't want to emit the error here?

I can imagine calling validate_candidate and not wanting to emit errors, e.g. for diagnostics.

eddyb · 2019-10-29T20:25:27Z

src/librustc_mir/transform/qualify_consts.rs

-                    } else {
-                        if is_shuffle {
-                            span_err!(self.tcx.sess, self.span, E0526,
-                                      "shuffle indices are not constant");


Probably need to fix tests because this shuffle-specific error message/code isn't emitted anymore? (i.e. now shuffles use the more general error)
I wonder what @gnzlbg thinks (it wouldn't be that hard to keep tbh).

There are no tests for non-const simd_shuffle args AFAICT. I could add one in this PR.

I can store is_shuffle in Candidate::Argument for now. Up to you.

I'm not actually sure how to test simd_shuffle, I might have to add a test in stdarch? The only thing exposed from core are platform-specific intrinsics that wrap the LLVM one and that already have rustc_args_required_const. Let me know if you have ideas.

Probably need to fix tests because this shuffle-specific error message/code isn't emitted anymore? (i.e. now shuffles use the more general error)
I wonder what @gnzlbg thinks (it wouldn't be that hard to keep tbh).

The shuffle intrinsics are only directly used by libcore, so this errors should only be seen by libcore-developers. I don't think having an specific error for this is worth it, the general one should do. rust-lang/stdarch#825 looks like a nice way to solve this problem, so this LGTM.

eddyb

r=me after error code cleanup

eddyb · 2019-10-30T15:13:58Z

src/librustc_mir/transform/qualify_consts.rs

                    if !IsNotPromotable::in_operand(self, arg) {
                        debug!("visit_terminator_kind: candidate={:?}", candidate);
                        self.promotion_candidates.push(candidate);
-                    } else {
-                        if is_shuffle {
-                            span_err!(self.tcx.sess, self.span, E0526,


Please remove (comment out? not sure) E0526 from:

src/librustc_mir/error_codes.rs

src/tools/tidy/src/error_codes_check.rs

I removed it entirely from tidy but commented it out in librustc_mir where there's other unused errors that are commented out.

It remains as a comment in `error_codes.rs` for consistency with other unused errors.

ecstatic-morse · 2019-10-30T15:38:58Z

All instances of the unused error code have been removed or commented out.

@bors r+ r=eddyb

bors · 2019-10-30T15:39:03Z

📌 Commit 627e3ef has been approved by eddyb

ecstatic-morse · 2019-10-30T15:40:18Z

Clearly I need to read up on bors etiquette XD.

@eddyb

… r=eddyb Make `promote_consts` emit the errors when required promotion fails A very minimal version of rust-lang#65942. This will cause a generic "argument X is required to be a constant" message for `simd_shuffle` LLVM intrinsics instead of the [custom one](https://github.com/rust-lang/rust/blob/caa1f8d7b3b021c86a70ff62d23a07d97acff4c4/src/librustc_mir/transform/qualify_consts.rs#L1616). It may be possible to remove this special-casing altogether after rust-lang/stdarch#825. r? @eddyb

@ghost

Rollup of 14 pull requests Successful merges: - #65112 (Add lint and tests for unnecessary parens around types) - #65459 (Fix `-Zunpretty=mir-cfg` to render multiple items) - #65471 (Add long error explanation for E0578) - #65857 (rustdoc: Resolve module-level doc references more locally) - #65914 (Use structured suggestion for unnecessary bounds in type aliases) - #65945 (Optimize long-linker-command-line test) - #65946 (Make `promote_consts` emit the errors when required promotion fails) - #65960 (doc: reword iter module example and mention other methods) - #65963 (update submodules to rust-lang) - #65972 (Fix libunwind build: Define __LITTLE_ENDIAN__ for LE targets) - #65977 (Fix incorrect diagnostics for expected type in E0271 with an associated type) - #65995 (Add error code E0743 for "C-variadic has been used on a non-foreign function") - #65997 (Fix outdated rustdoc of Once::init_locking function) - #66005 (vxWorks: remove code related unix socket) Failed merges: r? @ghost

@eddyb

… r=eddyb Make `promote_consts` emit the errors when required promotion fails A very minimal version of rust-lang#65942. This will cause a generic "argument X is required to be a constant" message for `simd_shuffle` LLVM intrinsics instead of the [custom one](https://github.com/rust-lang/rust/blob/caa1f8d7b3b021c86a70ff62d23a07d97acff4c4/src/librustc_mir/transform/qualify_consts.rs#L1616). It may be possible to remove this special-casing altogether after rust-lang/stdarch#825. r? @eddyb

@ghost

Rollup of 16 pull requests Successful merges: - #65112 (Add lint and tests for unnecessary parens around types) - #65470 (Don't hide ICEs from previous incremental compiles) - #65471 (Add long error explanation for E0578) - #65857 (rustdoc: Resolve module-level doc references more locally) - #65902 (Make ItemContext available for better diagnositcs) - #65914 (Use structured suggestion for unnecessary bounds in type aliases) - #65946 (Make `promote_consts` emit the errors when required promotion fails) - #65960 (doc: reword iter module example and mention other methods) - #65963 (update submodules to rust-lang) - #65972 (Fix libunwind build: Define __LITTLE_ENDIAN__ for LE targets) - #65977 (Fix incorrect diagnostics for expected type in E0271 with an associated type) - #65995 (Add error code E0743 for "C-variadic has been used on a non-foreign function") - #65997 (Fix outdated rustdoc of Once::init_locking function) - #66002 (Stabilize float_to_from_bytes feature) - #66005 (vxWorks: remove code related unix socket) - #66018 (Revert PR 64324: dylibs export generics again (for now)) Failed merges: r? @ghost

rust-highfive assigned eddyb Oct 29, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 29, 2019

eddyb reviewed Oct 29, 2019

View reviewed changes

src/librustc_mir/transform/promote_consts.rs Outdated Show resolved Hide resolved

eddyb reviewed Oct 29, 2019

View reviewed changes

ecstatic-morse force-pushed the refactor-promotion2 branch from e7b0424 to 5e00a78 Compare October 29, 2019 20:37

ecstatic-morse added 3 commits October 29, 2019 13:58

Add method to Candidate that determines its promotability rules

9bb9833

Emit errors in promote_consts when required promotion fails

46b68b0

Stop emitting error in qualify_consts if promotion fails

122c6fe

ecstatic-morse force-pushed the refactor-promotion2 branch from 5e00a78 to 122c6fe Compare October 29, 2019 20:58

ecstatic-morse mentioned this pull request Oct 29, 2019

Move promotion into its own pass #65949

Merged

eddyb approved these changes Oct 30, 2019

View reviewed changes

Remove references to now unused E0526

627e3ef

It remains as a comment in `error_codes.rs` for consistency with other unused errors.

This comment has been minimized.

Sign in to view

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 Oct 30, 2019

This comment has been minimized.

Sign in to view

tmandry mentioned this pull request Oct 31, 2019

Rollup of 14 pull requests #66009

Closed

tmandry mentioned this pull request Nov 1, 2019

Rollup of 16 pull requests #66021

Merged

bors merged commit 627e3ef into rust-lang:master Nov 1, 2019

ecstatic-morse mentioned this pull request Nov 2, 2019

ICE in qualify_consts.rs #66016

Closed

ecstatic-morse deleted the refactor-promotion2 branch October 6, 2020 01:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make `promote_consts` emit the errors when required promotion fails #65946

Make `promote_consts` emit the errors when required promotion fails #65946

ecstatic-morse commented Oct 29, 2019

eddyb Oct 29, 2019

ecstatic-morse Oct 29, 2019

eddyb Oct 29, 2019 •

edited

Loading

ecstatic-morse Oct 29, 2019 •

edited

Loading

ecstatic-morse Oct 29, 2019 •

edited

Loading

ecstatic-morse Oct 29, 2019

gnzlbg Oct 30, 2019

eddyb left a comment

eddyb Oct 30, 2019

ecstatic-morse Oct 30, 2019

ecstatic-morse commented Oct 30, 2019

This comment has been minimized.

This comment has been minimized.

bors commented Oct 30, 2019

ecstatic-morse commented Oct 30, 2019

Make promote_consts emit the errors when required promotion fails #65946

Make promote_consts emit the errors when required promotion fails #65946

Conversation

ecstatic-morse commented Oct 29, 2019

eddyb Oct 29, 2019

Choose a reason for hiding this comment

ecstatic-morse Oct 29, 2019

Choose a reason for hiding this comment

eddyb Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

ecstatic-morse Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

ecstatic-morse Oct 29, 2019 • edited Loading

Choose a reason for hiding this comment

ecstatic-morse Oct 29, 2019

Choose a reason for hiding this comment

gnzlbg Oct 30, 2019

Choose a reason for hiding this comment

eddyb left a comment

Choose a reason for hiding this comment

eddyb Oct 30, 2019

Choose a reason for hiding this comment

ecstatic-morse Oct 30, 2019

Choose a reason for hiding this comment

ecstatic-morse commented Oct 30, 2019

This comment has been minimized.

This comment has been minimized.

bors commented Oct 30, 2019

ecstatic-morse commented Oct 30, 2019

Make `promote_consts` emit the errors when required promotion fails #65946

Make `promote_consts` emit the errors when required promotion fails #65946

eddyb Oct 29, 2019 •

edited

Loading

ecstatic-morse Oct 29, 2019 •

edited

Loading

ecstatic-morse Oct 29, 2019 •

edited

Loading