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

Rollup of 9 pull requests #127125

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e9ea578
Move vcall_visibility_metadata optimization hint out of a debuginfo g…
bjorn3 Mar 30, 2024
7f44532
Remove PrintBackendInfo trait
bjorn3 Mar 30, 2024
98e8601
Remove const_bitcast from ConstMethods
bjorn3 Mar 30, 2024
e32eb4c
Dedup some intrinsic handling code for caller_location
bjorn3 Mar 30, 2024
22b3243
Move all intrinsic handling code in codegen_call_terminators together
bjorn3 Mar 30, 2024
aacdce3
Remove check_overflow method from MiscMethods
bjorn3 Mar 30, 2024
887f57f
Remove type_i1 and type_struct from cg_ssa
bjorn3 Mar 30, 2024
84f45bb
Fix doc comment
bjorn3 Mar 30, 2024
8a87f02
Improve error message in tidy
Kobzol Jun 25, 2024
151986f
Implement `x perf` as a separate tool
Kobzol Jun 27, 2024
a62cbda
Add feature diagnostic for unsafe_extern_blocks
spastorino Jun 29, 2024
50edb32
Fix a error suggestion for E0121 when using placeholder _ as return t…
surechen Jun 29, 2024
4442fd7
Add a run-make test that LLD is not being used by default on the x64 …
Kobzol Jun 28, 2024
9c0ce05
Show `used attribute`'s kind for user when find it isn't applied to a…
surechen Jun 29, 2024
8dc36c1
fix: prefer `(*p).clone` to `p.clone` if the `p` is a raw pointer
linyihai Jun 29, 2024
c54a2a5
Make mtime of reproducible tarball dependent on git commit
Kobzol Jun 27, 2024
f6f21a8
Review changes
Kobzol Jun 29, 2024
6a2638e
Autolabel `rustc-perf-wrapper` changes with t-bootstrap label
Kobzol Jun 29, 2024
15d5dac
Avoid suggesting to add unsafe when the extern block is already unsafe
spastorino Jun 29, 2024
31eed5d
Rollup merge of #123237 - bjorn3:debuginfo_refactor, r=compiler-errors
matthiaskrgr Jun 29, 2024
3f83e16
Rollup merge of #126960 - Kobzol:tidy-venv-message, r=tgross35
matthiaskrgr Jun 29, 2024
ffc429d
Rollup merge of #127002 - Kobzol:bootstrap-perf-tool, r=onur-ozkan
matthiaskrgr Jun 29, 2024
841d18d
Rollup merge of #127050 - Kobzol:reproducibility-git, r=onur-ozkan
matthiaskrgr Jun 29, 2024
bbd3a78
Rollup merge of #127081 - Kobzol:lld-test, r=onur-ozkan
matthiaskrgr Jun 29, 2024
b3b25bd
Rollup merge of #127106 - spastorino:improve-unsafe-extern-blocks-dia…
matthiaskrgr Jun 29, 2024
059e506
Rollup merge of #127110 - surechen:fix_125488_06, r=compiler-errors
matthiaskrgr Jun 29, 2024
5daa616
Rollup merge of #127114 - linyihai:issue-126863, r=Nadrieril
matthiaskrgr Jun 29, 2024
fb181b2
Rollup merge of #127118 - surechen:fix_126789, r=jieyouxu
matthiaskrgr Jun 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion compiler/rustc_hir_analysis/src/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1459,8 +1459,25 @@ fn infer_return_ty_for_fn_sig<'tcx>(
Some(ty) => {
let fn_sig = tcx.typeck(def_id).liberated_fn_sigs()[hir_id];
// Typeck doesn't expect erased regions to be returned from `type_of`.
// This is a heuristic approach. If the scope has region paramters,
// we should change fn_sig's lifetime from `ReErased` to `ReError`,
// otherwise to `ReStatic`.
let has_region_params = generics.params.iter().any(|param| match param.kind {
GenericParamKind::Lifetime { .. } => true,
_ => false,
});
let fn_sig = tcx.fold_regions(fn_sig, |r, _| match *r {
ty::ReErased => tcx.lifetimes.re_static,
ty::ReErased => {
if has_region_params {
ty::Region::new_error_with_message(
tcx,
DUMMY_SP,
"erased region is not allowed here in return type",
)
} else {
tcx.lifetimes.re_static
}
}
_ => r,
});

Expand Down
33 changes: 33 additions & 0 deletions tests/ui/return/infer-return-ty-for-fn-sig-issue-125488.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//@ run-rustfix

#[allow(dead_code)]

fn main() {
struct S<'a>(&'a ());

fn f1(s: S<'_>) -> S<'_> {
//~^ ERROR the placeholder `_` is not allowed
s
}

fn f2(s: S<'_>) -> S<'_> {
//~^ ERROR the placeholder `_` is not allowed
let x = true;
if x {
s
} else {
s
}
}

fn f3(s: S<'_>) -> S<'_> {
//~^ ERROR the placeholder `_` is not allowed
return s;
}

fn f4(s: S<'_>) -> S<'_> {
//~^ ERROR the placeholder `_` is not allowed
let _x = 1;
return s;
}
}
33 changes: 33 additions & 0 deletions tests/ui/return/infer-return-ty-for-fn-sig-issue-125488.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//@ run-rustfix

#[allow(dead_code)]

fn main() {
struct S<'a>(&'a ());

fn f1(s: S<'_>) -> _ {
//~^ ERROR the placeholder `_` is not allowed
s
}

fn f2(s: S<'_>) -> _ {
//~^ ERROR the placeholder `_` is not allowed
let x = true;
if x {
s
} else {
s
}
}

fn f3(s: S<'_>) -> _ {
//~^ ERROR the placeholder `_` is not allowed
return s;
}

fn f4(s: S<'_>) -> _ {
//~^ ERROR the placeholder `_` is not allowed
let _x = 1;
return s;
}
}
39 changes: 39 additions & 0 deletions tests/ui/return/infer-return-ty-for-fn-sig-issue-125488.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
--> $DIR/infer-return-ty-for-fn-sig-issue-125488.rs:8:24
|
LL | fn f1(s: S<'_>) -> _ {
| ^
| |
| not allowed in type signatures
| help: replace with the correct return type: `S<'_>`

error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
--> $DIR/infer-return-ty-for-fn-sig-issue-125488.rs:13:24
|
LL | fn f2(s: S<'_>) -> _ {
| ^
| |
| not allowed in type signatures
| help: replace with the correct return type: `S<'_>`

error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
--> $DIR/infer-return-ty-for-fn-sig-issue-125488.rs:23:24
|
LL | fn f3(s: S<'_>) -> _ {
| ^
| |
| not allowed in type signatures
| help: replace with the correct return type: `S<'_>`

error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
--> $DIR/infer-return-ty-for-fn-sig-issue-125488.rs:28:24
|
LL | fn f4(s: S<'_>) -> _ {
| ^
| |
| not allowed in type signatures
| help: replace with the correct return type: `S<'_>`

error: aborting due to 4 previous errors

For more information about this error, try `rustc --explain E0121`.
2 changes: 1 addition & 1 deletion tests/ui/typeck/typeck_type_placeholder_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Test9 {

fn test11(x: &usize) -> &_ {
//~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
&x //~ ERROR cannot return reference to function parameter
&x
}

unsafe fn test12(x: *const usize) -> *const *const _ {
Expand Down
12 changes: 3 additions & 9 deletions tests/ui/typeck/typeck_type_placeholder_item.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ LL | fn test11(x: &usize) -> &_ {
| -^
| ||
| |not allowed in type signatures
| help: replace with the correct return type: `&'static &'static usize`
| help: replace with the correct return type: `&&usize`

error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
--> $DIR/typeck_type_placeholder_item.rs:53:52
Expand Down Expand Up @@ -687,13 +687,7 @@ help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
LL + #![feature(const_trait_impl)]
|

error[E0515]: cannot return reference to function parameter `x`
--> $DIR/typeck_type_placeholder_item.rs:50:5
|
LL | &x
| ^^ returns a reference to data owned by the current function

error: aborting due to 75 previous errors
error: aborting due to 74 previous errors

Some errors have detailed explanations: E0015, E0046, E0121, E0282, E0403, E0515.
Some errors have detailed explanations: E0015, E0046, E0121, E0282, E0403.
For more information about an error, try `rustc --explain E0015`.