2020-07-06 23:49:53 +02:00
|
|
|
//! This module contains the functionality to convert from the wacky tcx data
|
2020-07-21 09:09:27 +00:00
|
|
|
//! structures into the THIR. The `builder` is generally ignorant of the tcx,
|
2019-02-08 14:53:55 +01:00
|
|
|
//! etc., and instead goes through the `Cx` for most of its work.
|
2015-10-05 12:31:48 -04:00
|
|
|
|
2021-04-04 02:24:02 +02:00
|
|
|
use crate::thir::pattern::pat_from_hir;
|
2021-04-04 18:42:17 +02:00
|
|
|
use crate::thir::util::UserAnnotatedTyHelpers;
|
2015-10-05 12:31:48 -04:00
|
|
|
|
2021-04-04 18:42:17 +02:00
|
|
|
use rustc_data_structures::steal::Steal;
|
2022-01-22 18:49:12 -06:00
|
|
|
use rustc_errors::ErrorGuaranteed;
|
2020-01-05 02:37:57 +01:00
|
|
|
use rustc_hir as hir;
|
2020-07-06 23:49:53 +02:00
|
|
|
use rustc_hir::def_id::{DefId, LocalDefId};
|
Use larger span for adjustments on method calls
Currently, we use a relatively 'small' span for THIR
expressions generated by an 'adjustment' (e.g. an autoderef,
autoborrow, unsizing). As a result, if a borrow generated
by an adustment ends up causing a borrowcheck error, for example:
```rust
let mut my_var = String::new();
let my_ref = &my_var
my_var.push('a');
my_ref;
```
then the span for the mutable borrow may end up referring
to only the base expression (e.g. `my_var`), rather than
the method call which triggered the mutable borrow
(e.g. `my_var.push('a')`)
Due to a quirk of the MIR borrowck implementation,
this doesn't always get exposed in migration mode,
but it does in many cases.
This commit makes THIR building consistently use 'larger'
spans for adjustment expressions
The intent of this change it make it clearer to users
when it's the specific way in which a variable is
used (for example, in a method call) that produdes
a borrowcheck error. For example, an error message
claiming that a 'mutable borrow occurs here' might
be confusing if it just points at a usage of a variable
(e.g. `my_var`), when no `&mut` is in sight. Pointing
at the entire expression should help to emphasize
that the method call itself is responsible for
the mutable borrow.
In several cases, this makes the `#![feature(nll)]` diagnostic
output match up exactly with the default (migration mode) output.
As a result, several `.nll.stderr` files end up getting removed
entirely.
2021-09-16 15:01:22 -05:00
|
|
|
use rustc_hir::HirId;
|
2020-01-05 02:37:57 +01:00
|
|
|
use rustc_hir::Node;
|
2020-03-29 17:19:48 +02:00
|
|
|
use rustc_middle::middle::region;
|
2021-04-04 02:24:02 +02:00
|
|
|
use rustc_middle::thir::*;
|
2022-06-23 22:16:50 +02:00
|
|
|
use rustc_middle::ty::{self, RvalueScopes, TyCtxt};
|
2021-04-04 02:24:02 +02:00
|
|
|
use rustc_span::Span;
|
2015-08-18 17:59:21 -04:00
|
|
|
|
2022-05-20 19:51:09 -04:00
|
|
|
pub(crate) fn thir_body<'tcx>(
|
2019-06-14 00:48:52 +03:00
|
|
|
tcx: TyCtxt<'tcx>,
|
2021-03-05 21:56:02 +01:00
|
|
|
owner_def: ty::WithOptConstParam<LocalDefId>,
|
2022-01-22 18:49:12 -06:00
|
|
|
) -> Result<(&'tcx Steal<Thir<'tcx>>, ExprId), ErrorGuaranteed> {
|
2021-04-04 18:42:17 +02:00
|
|
|
let hir = tcx.hir();
|
2022-07-15 23:13:04 -04:00
|
|
|
let body = hir.body(hir.body_owned_by(owner_def.did));
|
2021-04-03 19:58:46 +02:00
|
|
|
let mut cx = Cx::new(tcx, owner_def);
|
2022-01-22 18:49:12 -06:00
|
|
|
if let Some(reported) = cx.typeck_results.tainted_by_errors {
|
|
|
|
return Err(reported);
|
2021-05-22 15:40:26 +02:00
|
|
|
}
|
2021-04-04 18:42:17 +02:00
|
|
|
let expr = cx.mirror_expr(&body.value);
|
2022-01-22 18:49:12 -06:00
|
|
|
Ok((tcx.alloc_steal_thir(cx.thir), expr))
|
2021-03-05 21:56:02 +01:00
|
|
|
}
|
|
|
|
|
2022-05-20 19:51:09 -04:00
|
|
|
pub(crate) fn thir_tree<'tcx>(
|
2021-07-24 17:18:15 -04:00
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
owner_def: ty::WithOptConstParam<LocalDefId>,
|
|
|
|
) -> String {
|
2022-01-22 18:49:12 -06:00
|
|
|
match thir_body(tcx, owner_def) {
|
|
|
|
Ok((thir, _)) => format!("{:#?}", thir.steal()),
|
|
|
|
Err(_) => "error".into(),
|
|
|
|
}
|
2021-07-24 17:18:15 -04:00
|
|
|
}
|
|
|
|
|
2021-04-03 19:58:46 +02:00
|
|
|
struct Cx<'tcx> {
|
2021-03-05 21:56:02 +01:00
|
|
|
tcx: TyCtxt<'tcx>,
|
2021-04-03 19:58:46 +02:00
|
|
|
thir: Thir<'tcx>,
|
2017-07-26 15:54:44 +03:00
|
|
|
|
2022-05-20 19:51:09 -04:00
|
|
|
pub(crate) param_env: ty::ParamEnv<'tcx>,
|
2017-07-26 15:54:44 +03:00
|
|
|
|
2022-05-20 19:51:09 -04:00
|
|
|
pub(crate) region_scope_tree: &'tcx region::ScopeTree,
|
|
|
|
pub(crate) typeck_results: &'tcx ty::TypeckResults<'tcx>,
|
2022-04-01 21:12:18 +08:00
|
|
|
pub(crate) rvalue_scopes: &'tcx RvalueScopes,
|
2016-05-26 15:42:29 +03:00
|
|
|
|
Use larger span for adjustments on method calls
Currently, we use a relatively 'small' span for THIR
expressions generated by an 'adjustment' (e.g. an autoderef,
autoborrow, unsizing). As a result, if a borrow generated
by an adustment ends up causing a borrowcheck error, for example:
```rust
let mut my_var = String::new();
let my_ref = &my_var
my_var.push('a');
my_ref;
```
then the span for the mutable borrow may end up referring
to only the base expression (e.g. `my_var`), rather than
the method call which triggered the mutable borrow
(e.g. `my_var.push('a')`)
Due to a quirk of the MIR borrowck implementation,
this doesn't always get exposed in migration mode,
but it does in many cases.
This commit makes THIR building consistently use 'larger'
spans for adjustment expressions
The intent of this change it make it clearer to users
when it's the specific way in which a variable is
used (for example, in a method call) that produdes
a borrowcheck error. For example, an error message
claiming that a 'mutable borrow occurs here' might
be confusing if it just points at a usage of a variable
(e.g. `my_var`), when no `&mut` is in sight. Pointing
at the entire expression should help to emphasize
that the method call itself is responsible for
the mutable borrow.
In several cases, this makes the `#![feature(nll)]` diagnostic
output match up exactly with the default (migration mode) output.
As a result, several `.nll.stderr` files end up getting removed
entirely.
2021-09-16 15:01:22 -05:00
|
|
|
/// When applying adjustments to the expression
|
|
|
|
/// with the given `HirId`, use the given `Span`,
|
|
|
|
/// instead of the usual span. This is used to
|
|
|
|
/// assign the span of an overall method call
|
|
|
|
/// (e.g. `my_val.foo()`) to the adjustment expressions
|
|
|
|
/// for the receiver.
|
|
|
|
adjustment_span: Option<(HirId, Span)>,
|
|
|
|
|
2019-05-07 04:40:36 +03:00
|
|
|
/// The `DefId` of the owner of this body.
|
|
|
|
body_owner: DefId,
|
2015-08-18 17:59:21 -04:00
|
|
|
}
|
|
|
|
|
2021-04-03 19:58:46 +02:00
|
|
|
impl<'tcx> Cx<'tcx> {
|
|
|
|
fn new(tcx: TyCtxt<'tcx>, def: ty::WithOptConstParam<LocalDefId>) -> Cx<'tcx> {
|
2020-07-17 08:47:04 +00:00
|
|
|
let typeck_results = tcx.typeck_opt_const_arg(def);
|
2017-07-26 15:54:44 +03:00
|
|
|
Cx {
|
|
|
|
tcx,
|
2021-04-03 19:58:46 +02:00
|
|
|
thir: Thir::new(),
|
2020-07-06 23:49:53 +02:00
|
|
|
param_env: tcx.param_env(def.did),
|
2022-05-25 13:52:32 +08:00
|
|
|
region_scope_tree: tcx.region_scope_tree(def.did),
|
2020-07-17 08:47:04 +00:00
|
|
|
typeck_results,
|
2022-04-01 21:12:18 +08:00
|
|
|
rvalue_scopes: &typeck_results.rvalue_scopes,
|
2020-07-06 23:49:53 +02:00
|
|
|
body_owner: def.did.to_def_id(),
|
Use larger span for adjustments on method calls
Currently, we use a relatively 'small' span for THIR
expressions generated by an 'adjustment' (e.g. an autoderef,
autoborrow, unsizing). As a result, if a borrow generated
by an adustment ends up causing a borrowcheck error, for example:
```rust
let mut my_var = String::new();
let my_ref = &my_var
my_var.push('a');
my_ref;
```
then the span for the mutable borrow may end up referring
to only the base expression (e.g. `my_var`), rather than
the method call which triggered the mutable borrow
(e.g. `my_var.push('a')`)
Due to a quirk of the MIR borrowck implementation,
this doesn't always get exposed in migration mode,
but it does in many cases.
This commit makes THIR building consistently use 'larger'
spans for adjustment expressions
The intent of this change it make it clearer to users
when it's the specific way in which a variable is
used (for example, in a method call) that produdes
a borrowcheck error. For example, an error message
claiming that a 'mutable borrow occurs here' might
be confusing if it just points at a usage of a variable
(e.g. `my_var`), when no `&mut` is in sight. Pointing
at the entire expression should help to emphasize
that the method call itself is responsible for
the mutable borrow.
In several cases, this makes the `#![feature(nll)]` diagnostic
output match up exactly with the default (migration mode) output.
As a result, several `.nll.stderr` files end up getting removed
entirely.
2021-09-16 15:01:22 -05:00
|
|
|
adjustment_span: None,
|
2017-07-26 15:54:44 +03:00
|
|
|
}
|
2015-08-18 17:59:21 -04:00
|
|
|
}
|
|
|
|
|
2022-08-31 13:01:10 +00:00
|
|
|
#[instrument(level = "debug", skip(self))]
|
2022-08-25 12:25:44 +10:00
|
|
|
pub(crate) fn pattern_from_hir(&mut self, p: &hir::Pat<'_>) -> Box<Pat<'tcx>> {
|
2019-09-25 15:36:14 -04:00
|
|
|
let p = match self.tcx.hir().get(p.hir_id) {
|
2022-06-28 13:15:30 -05:00
|
|
|
Node::Pat(p) => p,
|
2017-08-04 00:41:44 +03:00
|
|
|
node => bug!("pattern became {:?}", node),
|
|
|
|
};
|
2021-04-04 02:24:02 +02:00
|
|
|
pat_from_hir(self.tcx, self.param_env, self.typeck_results(), p)
|
2017-08-04 00:41:44 +03:00
|
|
|
}
|
2015-08-18 17:59:21 -04:00
|
|
|
}
|
|
|
|
|
2021-04-03 19:58:46 +02:00
|
|
|
impl<'tcx> UserAnnotatedTyHelpers<'tcx> for Cx<'tcx> {
|
2019-06-14 00:48:52 +03:00
|
|
|
fn tcx(&self) -> TyCtxt<'tcx> {
|
2021-03-03 16:35:54 +01:00
|
|
|
self.tcx
|
2018-10-02 11:00:57 -04:00
|
|
|
}
|
|
|
|
|
2020-07-17 08:47:04 +00:00
|
|
|
fn typeck_results(&self) -> &ty::TypeckResults<'tcx> {
|
2021-03-03 16:35:54 +01:00
|
|
|
self.typeck_results
|
2018-10-02 11:00:57 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-18 17:59:21 -04:00
|
|
|
mod block;
|
|
|
|
mod expr;
|