about summary refs log tree commit diff
path: root/src
AgeCommit message (Collapse)AuthorLines
2020-02-13Rollup merge of #69127 - tmiasko:new-pass-manager-use-after-scope, r=nikicDylan DPC-2/+2
Enable use after scope detection in the new LLVM pass manager Implementation of 08a1c566a792dcf9657d293155f7ada87746bb65 for the new LLVM pass manager, support for which landed in the meantime.
2020-02-13Rollup merge of #69126 - RalfJung:exact-div, r=oli-obkDylan DPC-2/+4
miri: fix exact_div Turns out `exact_div` was relying on the broken behavior of `Rem` for `int_min % -1` that was fixed in https://github.com/rust-lang/rust/pull/69002. This PR fixes `exact_div`. Inside rustc, `exact_div` is only used in a single place where the divisor is always positive (in `ptr_offset_from`), so we cannot test the fix in rustc. The Miri test suite covers this through the `exact_div` intrinsic, though (and it is how I found out). One step to https://github.com/rust-lang/rust/issues/69117 (then we also need to address build failures introduced by https://github.com/rust-lang/rust/pull/68969) r? @oli-obk
2020-02-13Rollup merge of #69125 - jethrogb:jb/cleanup-sgx-entry, r=Dylan-DPCDylan DPC-0/+1
Add comment to SGX entry code Meant to force push this to be included in #69040, but forgot r? @nagisa
2020-02-13Rollup merge of #69108 - cjgillot:trait_candidate, r=ZoxcDylan DPC-18/+29
Use HirId in TraitCandidate. I had to duplicate the `TraitMap` type to hold `NodeId`s until AST->HIR lowering is done. r? @Zoxc
2020-02-13Rollup merge of #69057 - Centril:clean-expand, r=petrochenkovDylan DPC-114/+94
expand: misc cleanups and simplifications Some work I did while trying to understand expand for the purposes of https://github.com/rust-lang/rust/issues/64197. r? @petrochenkov
2020-02-13Rollup merge of #68938 - Areredify:gat_lifetime_shadowing, r=estebankDylan DPC-6/+25
fix lifetime shadowing check in GATs closes #67512
2020-02-13Rollup merge of #68728 - Centril:towards-fn-merge, r=petrochenkovDylan DPC-723/+596
parse: merge `fn` syntax + cleanup item parsing Here we continue the work in https://github.com/rust-lang/rust/pull/67131 in particular to merge the grammars of `fn` items in various positions. A list of *language level* changes (as sanctioned by the language team in https://github.com/rust-lang/rust/issues/65041#issuecomment-538105286 and https://github.com/rust-lang/rust/pull/67131): - `self` parameters are now *syntactically* allowed as the first parameter irrespective of item context (and in function pointers). Instead, semantic validation (`ast_validation`) is used. - Syntactically, `fn` items in `extern { ... }` blocks can now have bodies (`fn foo() { ... }` as opposed to `fn foo();`). As above, we use semantic restrictions instead. - Syntactically, `fn` items in free contexts (directly in a file or a module) can now be without bodies (`fn foo();` as opposed to `fn foo() { ... }`. As above, we use semantic restrictions instead, including for non-ident parameter patterns. - `const extern fn` feature gating is now done post-expansion such that we do not have conditional compatibilities of function qualifiers *in parsing*. - The `FnFrontMatter` grammar becomes: ```rust Extern = "extern" StringLit ; FnQual = "const"? "async"? "unsafe"? Extern? ; FnFrontMatter = FnQual "fn" ; ``` That is, all item contexts now *syntactically* allow `const async unsafe extern "C" fn` and use semantic restrictions to rule out combinations previously prevented syntactically. The semantic restrictions include in particular: - `fn`s in `extern { ... }` can have no qualifiers. - `const` and `async` cannot be combined. - To fuse the list-of-items parsing in the 4 contexts that items are allowed, we now must permit inner attributes (`#![attr]`) inside `trait Foo { ... }` definitions. That is, we now allow e.g. `trait Foo { #![attr] }`. This was probably an oversight due to not using a uniform parsing mechanism, which we now do have (`fn parse_item_list`). The semantic support (including e.g. for linting) falls out directly from the attributes infrastructure. To ensure this, we include a test for lints. Put together, these grammar changes allow us to substantially reduce the complexity of item parsing and its grammar. There are however some other non-language improvements that allow the compression to take place. A list of *compiler-internal* changes (in particular noting the parser-external data-structure changes): - We use `enum AllowPlus/RecoverQPath/AllowCVariadic { Yes, No }` in `parser/ty.rs` instead of passing around 3 different `bool`s. I felt this was necessary as it was becoming mentally taxing to track which-is-which. - `fn visit_trait_item` and `fn visit_impl_item` are merged into `fn visit_assoc_item` which now is passed an `AssocCtxt` to check which one it is. - We change `FnKind` to: ```rust pub enum FnKind<'a> { Fn(FnCtxt, Ident, &'a FnSig, &'a Visibility, Option<&'a Block>), Closure(&'a FnDecl, &'a Expr), } ``` with: ```rust pub enum FnCtxt { Free, Foreign, Assoc(AssocCtxt), } ``` This is then taken advantage of in tweaking the various semantic restrictions as well as in pretty printing. - In `ItemKind::Fn`, we change `P<Block>` to `Option<P<Block>>`. - In `ForeignItemKind::Fn`, we change `P<FnDecl>` to `FnSig` and `P<Block>` to `Option<P<Block>>`. - We change `ast::{Unsafety, Spanned<Constness>}>` into `enum ast::{Unsafe, Const} { Yes(Span), No }` respectively. This change in formulation allow us to exclude `Span` in the case of `No`, which facilitates parsing. Moreover, we also add a `Span` to `IsAsync` which is renamed to `Async`. The new `Span`s in `Unsafety` and `Async` are then taken advantage of for better diagnostics. A reason this change was made is to have a more uniform and clear naming scheme. The HIR keeps the structures in AST (with those definitions moved into HIR) for now to avoid regressing perf. - Various cleanups, bug fixes, and diagnostics improvements are made along the way. It is probably best to understand those via the diffs. I would recommend reviewing this commit-by-commit with whitespace changes hidden. r? @estebank @petrochenkov
2020-02-13Make TraitCandidate generic.Camille GILLOT-30/+26
2020-02-13Use HirId in TraitCandidate.Camille GILLOT-16/+31
2020-02-13parser: inline parse_assoc_macro_invocMazdak Farrokhzad-20/+10
2020-02-13parser: misc small item related improvements & cleanups.Mazdak Farrokhzad-249/+233
2020-02-13parser: extract `recover_const_mut`.Mazdak Farrokhzad-13/+17
2020-02-13parser: fuse `trait` parsing & layer with `is_path_start_item`Mazdak Farrokhzad-35/+27
2020-02-13parser: make `eat_macro_def` redundant.Mazdak Farrokhzad-33/+12
2020-02-13parser: remove `Option<Vec<Attribute>>` in `ItemInfo`.Mazdak Farrokhzad-59/+50
2020-02-13parser_item_mod: avoid cloning outer attributesMazdak Farrokhzad-23/+16
2020-02-13parser: introduce `parse_item_kind` as central `ItemInfo` logic.Mazdak Farrokhzad-197/+168
this also extracts macro item parsers.
2020-02-13parser: extract `recover_missing_kw_before_item`Mazdak Farrokhzad-84/+90
2020-02-13parser: unify item list parsing.Mazdak Farrokhzad-71/+80
as a consequence, `trait X { #![attr] }` becomes legal.
2020-02-13parser: extract common foreign item code for each kindMazdak Farrokhzad-67/+21
2020-02-13Auto merge of #68969 - RalfJung:dont-panic, r=oli-obkbors-274/+271
remove Panic variant from InterpError The interpreter engine itself does not raise `Panic` errors any more, so remove them from the error enum. Instead, const-prop and const-eval have to do their own handling of panics. I used the opportunity to refactor the const-eval error handling a bit to use the `MachineStop` variant. Also, in const-prop I could do some cleanup as now, no more lints are being reported in `use_ecx`. However, I am quite puzzled by why exactly the linting there works the way it does -- the code can certainly be cleaned up more, but I don't know enough of the intent to do that. I left some questions for the most confusing parts, but for now behavior should be unchanged by this PR (so, all that weirdness I am asking about is pre-existing and merely maintained here). Cc @wesleywiser Fixes https://github.com/rust-lang/rust/issues/66902 r? @oli-obk
2020-02-13fix typoRalf Jung-1/+1
2020-02-13expand: simplify flat_map_item wrt. inline module detectionMazdak Farrokhzad-7/+4
2020-02-13expand: simplify flat_map_itemMazdak Farrokhzad-5/+1
2020-02-13expand: simplify classify_*Mazdak Farrokhzad-8/+5
2020-02-13expand: extract error_wrong_fragment_kindMazdak Farrokhzad-7/+13
2020-02-13expand: extract error_recursion_limit_reachedMazdak Farrokhzad-11/+16
2020-02-13miri: fix exact_divRalf Jung-2/+4
2020-02-13rename PanicInfo -> AssertKindRalf Jung-41/+41
2020-02-13improve comments:Ralf Jung-4/+9
- comment for special handling of Shl/Shr - reference a PR
2020-02-13small cleanup in ConstEvalErr::struct_genericRalf Jung-31/+40
2020-02-13move PanicInfo to mir moduleRalf Jung-80/+78
2020-02-13no need for hook_panic_fn to return a boolRalf Jung-10/+8
2020-02-13remove PanicInfo::Panic variant that MIR does not use or needRalf Jung-18/+16
2020-02-13const-prop: handle overflow_check consistently for all operatorsRalf Jung-15/+10
2020-02-13remove Panic variant from InterpErrorRalf Jung-123/+117
2020-02-13expand: extract error_derive_forbidden_on_non_adtMazdak Farrokhzad-22/+22
2020-02-13simplify config::featuresMazdak Farrokhzad-19/+18
2020-02-13StripUnconfigured::in_cfg: simplify with slice patternsMazdak Farrokhzad-36/+16
2020-02-13parser: is_fn_front_matter -> check_fn_front_matterMazdak Farrokhzad-4/+4
2020-02-13parser: add test for 'extern crate async'Mazdak Farrokhzad-0/+12
2020-02-13rustc_bulltin_macros: tweak span_labelsMazdak Farrokhzad-2/+2
2020-02-13ast_validation: tweak diagnostic outputMazdak Farrokhzad-81/+96
2020-02-13parser: simplify ParamCfg -> ReqNameMazdak Farrokhzad-30/+18
2020-02-13parser: address review commentsMazdak Farrokhzad-2/+2
2020-02-13parser: move `ban_async_in_2015` to `fn` parsing & improve it.Mazdak Farrokhzad-13/+48
2020-02-13parser: inline `parse_assoc_fn` and friends.Mazdak Farrokhzad-42/+21
2020-02-13parser: solidify `fn` parsing with `parse_fn`.Mazdak Farrokhzad-23/+30
2020-02-13parser: fuse free `fn` parsing together.Mazdak Farrokhzad-185/+181
2020-02-13parser_fn_front_matter: allow `const .. extern`Mazdak Farrokhzad-107/+104