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

Emit an error for invalid item of instruction_set #129002

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

chansuke
Copy link
Contributor

Closes #128489

Emit an error on invalid item of instruction_set.

This PR merges the instruction_set error handling into rustc_passes/check_attr.rs. This change was necessary because the codegen_attrs only handle the Fn target.

@rustbot
Copy link
Collaborator

rustbot commented Aug 12, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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 Aug 12, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Aug 17, 2024

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

@Dylan-DPC
Copy link
Member

@chansuke if you can resolve the conflicts we can then push this pr forward. Thanks

@Dylan-DPC Dylan-DPC 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 Nov 6, 2024
@@ -2349,6 +2353,43 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
}
}
}

fn check_instruction_set(&self, attr: &Attribute, _item: Option<ItemLike<'_>>) {
Copy link
Member

Choose a reason for hiding this comment

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

I think we also want to valid that item is a function or closure and not anything else like a module or type (and use on any of those should give a specific error that the attribute can only be used on functions and such).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wesleywiser
Thank you for your review!! Ok, i'll fix that.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
           --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
---
#13 2.842 Building wheels for collected packages: reuse
#13 2.843   Building wheel for reuse (pyproject.toml): started
#13 3.089   Building wheel for reuse (pyproject.toml): finished with status 'done'
#13 3.090   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132720 sha256=026f3bb0f1aa8090b861fd0a0939cb1a782396d84c8aab7875096557d637a0f6
#13 3.090   Stored in directory: /tmp/pip-ephem-wheel-cache-yhg165mo/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#13 3.093 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#13 3.482 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#13 3.482 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#13 4.011 Collecting virtualenv
#13 4.011 Collecting virtualenv
#13 4.077   Downloading virtualenv-20.27.1-py3-none-any.whl (3.1 MB)
#13 4.362      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.1/3.1 MB 11.0 MB/s eta 0:00:00
#13 4.419 Collecting platformdirs<5,>=3.9.1
#13 4.432   Downloading platformdirs-4.3.6-py3-none-any.whl (18 kB)
#13 4.456 Collecting distlib<1,>=0.3.7
#13 4.494      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 19.7 MB/s eta 0:00:00
#13 4.533 Collecting filelock<4,>=3.12.2
#13 4.546   Downloading filelock-3.16.1-py3-none-any.whl (16 kB)
#13 4.546   Downloading filelock-3.16.1-py3-none-any.whl (16 kB)
#13 4.628 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#13 4.801 Successfully installed distlib-0.3.9 filelock-3.16.1 platformdirs-4.3.6 virtualenv-20.27.1
#13 DONE 4.9s

#14 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#14 DONE 0.0s
---
DirectMap4k:      298944 kB
DirectMap2M:     9138176 kB
DirectMap1G:     9437184 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test            --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
    Finished `dev` profile [unoptimized] target(s) in 0.04s
##[endgroup]
downloading https://static.rust-lang.org/dist/2024-10-16/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/2024-10-16/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/rustfmt
---
   Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
    Finished `release` profile [optimized] target(s) in 30.92s
##[endgroup]
fmt check
Diff in /checkout/compiler/rustc_codegen_ssa/src/codegen_attrs.rs:1:
-use rustc_ast::{ast, attr, MetaItemInner, MetaItemKind};
-use rustc_attr::{list_contains_name, InlineAttr, InstructionSetAttr, OptimizeAttr};
+use rustc_ast::{MetaItemInner, MetaItemKind, ast, attr};
+use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr, list_contains_name};
 use rustc_errors::codes::*;
 use rustc_errors::codes::*;
-use rustc_errors::{struct_span_code_err, DiagMessage, SubdiagMessage};
+use rustc_errors::{DiagMessage, SubdiagMessage, struct_span_code_err};
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
-use rustc_hir::def_id::{DefId, LocalDefId, LOCAL_CRATE};
+use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId};
 use rustc_hir::weak_lang_items::WEAK_LANG_ITEMS;
-use rustc_hir::{lang_items, LangItem};
+use rustc_hir::{LangItem, lang_items};
 use rustc_middle::middle::codegen_fn_attrs::{
     CodegenFnAttrFlags, CodegenFnAttrs, PatchableFunctionEntry,
Diff in /checkout/compiler/rustc_codegen_ssa/src/codegen_attrs.rs:15:
 use rustc_middle::query::Providers;
 use rustc_middle::ty::{self as ty, TyCtxt};
 use rustc_session::parse::feature_err;
 use rustc_session::parse::feature_err;
-use rustc_session::{lint, Session};
+use rustc_session::{Session, lint};
 use rustc_span::symbol::Ident;
-use rustc_span::{sym, Span};
-use rustc_target::spec::{abi, SanitizerSet};
+use rustc_span::{Span, sym};
+use rustc_target::spec::{SanitizerSet, abi};
 use crate::errors;
 use crate::target_features::{check_target_feature_trait_unsafe, from_target_feature_attr};
 use crate::target_features::{check_target_feature_trait_unsafe, from_target_feature_attr};
fmt error: Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/rustfmt/bin/rustfmt" "--config-path" "/checkout" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/checkout/tests/run-make/c-static-dylib/bar.rs" "/checkout/tests/run-make/c-static-dylib/rmake.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/intrinsic.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/locals.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/constant.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/place.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/operand.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/statement.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/rvalue.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs" "/checkout/compiler/rustc_codegen_ssa/src/mir/mod.rs" "/checkout/compiler/rustc_codegen_ssa/src/assert_module_sources.rs" "/checkout/compiler/rustc_codegen_ssa/src/codegen_attrs.rs" "/checkout/compiler/rustc_codegen_ssa/src/base.rs" "/checkout/tests/run-make/pgo-gen-no-imp-symbols/test.rs" "/checkout/tests/run-make/pgo-gen-no-imp-symbols/rmake.rs" "/checkout/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs" "/checkout/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs" "/checkout/tests/run-make/relro-levels/hello.rs" "/checkout/tests/run-make/relro-levels/rmake.rs" "/checkout/compiler/rustc_codegen_ssa/src/errors.rs" "/checkout/compiler/rustc_codegen_ssa/src/common.rs" "/checkout/tests/run-make/incr-foreign-head-span/second_crate.rs" "/checkout/tests/run-make/incr-foreign-head-span/rmake.rs" "/checkout/tests/run-make/incr-foreign-head-span/first_crate.rs" "/checkout/tests/run-make/emit-stack-sizes/foo.rs" "/checkout/tests/run-make/emit-stack-sizes/rmake.rs" "/checkout/tests/run-make/test-benches/smokebench.rs" "/checkout/tests/run-make/test-benches/rmake.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/apple.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/linker.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/symbol_export.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/write.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/rpath.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/lto.rs" "/checkout/tests/run-make/no-builtins-lto/main.rs" "/checkout/tests/run-make/no-builtins-lto/no_builtins.rs" "/checkout/tests/run-make/no-builtins-lto/rmake.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/rpath/tests.rs" "/checkout/tests/run-make/windows-safeseh/foo.rs" "/checkout/tests/run-make/windows-safeseh/bar.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/apple/tests.rs" "/checkout/tests/run-make/windows-safeseh/rmake.rs" "/checkout/tests/run-make/windows-safeseh/baz.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/metadata.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/archive.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/command.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/mod.rs" "/checkout/compiler/rustc_codegen_ssa/src/back/link.rs" "/checkout/compiler/rustc_codegen_ssa/src/lib.rs" "/checkout/tests/run-make/share-generics-dylib/instance_provider_a.rs" "/checkout/tests/run-make/share-generics-dylib/linked_leaf.rs" "/checkout/tests/run-make/share-generics-dylib/instance_user_dylib.rs" "/checkout/tests/run-make/share-generics-dylib/instance_provider_b.rs" "/checkout/tests/run-make/share-generics-dylib/rmake.rs" "/checkout/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs" "/checkout/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs" "/checkout/tests/run-make/wasm-export-all-symbols/main.rs" "/checkout/tests/run-make/wasm-export-all-symbols/foo.rs" "/checkout/tests/run-make/wasm-export-all-symbols/bar.rs" "/checkout/tests/run-make/wasm-export-all-symbols/rmake.rs" "/checkout/tests/run-make/rustdoc-scrape-examples-multiple/rmake.rs" "/checkout/tests/run-make/rustdoc-scrape-examples-multiple/src/lib.rs" "/checkout/tests/run-make/c-static-dylib/foo.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
  local time: Fri Nov 22 04:12:19 UTC 2024
  network time: Fri, 22 Nov 2024 04:12:19 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

instruction_set attribute can be applied to anything
6 participants