Auto merge of rust-lang#139459 - compiler-errors:incr-tainting, r=<try>

Stop dirtying incremental with span access when computing region scope span

This probably won't do any good, but I saw the `mir_build` query being recomputed in incremental a lot b/c it accesses untracked span data via the `SourceMap::end_point` method.

There may be a smarter way to compute this w/o needing to do span computations which negatively affect incremental.

r? `@ghost`

Author: bors

compiler/rustc_middle/src/ty/significant_drop_order.rs

@@ -143,25 +143,11 @@ pub fn ty_dtor_span<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<Span> {
         | ty::UnsafeBinder(_) => None,
 
         ty::Adt(adt_def, _) => {
-            let did = adt_def.did();
-            let try_local_did_span = |did: DefId| {
-                if let Some(local) = did.as_local() {
-                    tcx.source_span(local)
-                } else {
-                    tcx.def_span(did)
-                }
-            };
-            let dtor = if let Some(dtor) = tcx.adt_destructor(did) {
-                dtor.did
-            } else if let Some(dtor) = tcx.adt_async_destructor(did) {
-                return Some(tcx.source_span(dtor.impl_did));
+            if let Some(dtor) = tcx.adt_destructor(adt_def.did()) {
+                Some(tcx.def_span(tcx.parent(dtor.did)))
             } else {
-                return Some(try_local_did_span(did));
-            };
-            let def_key = tcx.def_key(dtor);
-            let Some(parent_index) = def_key.parent else { return Some(try_local_did_span(dtor)) };
-            let parent_did = DefId { index: parent_index, krate: dtor.krate };
-            Some(try_local_did_span(parent_did))
+                Some(tcx.def_span(adt_def.did()))
+            }
         }
         ty::Coroutine(did, _)
         | ty::CoroutineWitness(did, _)

compiler/rustc_mir_build/src/builder/scope.rs

@@ -1135,11 +1135,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
             if scope.region_scope == region_scope {
                 let region_scope_span = region_scope.span(self.tcx, self.region_scope_tree);
-                // Attribute scope exit drops to scope's closing brace.
-                let scope_end = self.tcx.sess.source_map().end_point(region_scope_span);
 
                 scope.drops.push(DropData {
-                    source_info: SourceInfo { span: scope_end, scope: scope.source_scope },
+                    source_info: SourceInfo {
+                        span: region_scope_span.shrink_to_hi(),
+                        scope: scope.source_scope,
+                    },
                     local,
                     kind: drop_kind,
                 });

tests/ui/async-await/async-closures/without-precise-captures-we-are-powerless.stderr

@@ -27,7 +27,7 @@ LL |     outlives::<'a>(c());
    |     argument requires that `c` is borrowed for `'a`
 LL |     outlives::<'a>(call_once(c));
 LL | }
-   | - `c` dropped here while still borrowed
+   |  - `c` dropped here while still borrowed
 
 error[E0597]: `x` does not live long enough
   --> $DIR/without-precise-captures-we-are-powerless.rs:26:13
@@ -72,7 +72,7 @@ LL |     outlives::<'a>(c());
    |     argument requires that `c` is borrowed for `'a`
 LL |     outlives::<'a>(call_once(c));
 LL | }
-   | - `c` dropped here while still borrowed
+   |  - `c` dropped here while still borrowed
 
 error[E0505]: cannot move out of `c` because it is borrowed
   --> $DIR/without-precise-captures-we-are-powerless.rs:32:30
@@ -126,7 +126,7 @@ LL |     outlives::<'a>(c());
    |     argument requires that `c` is borrowed for `'a`
 LL |     outlives::<'a>(call_once(c));
 LL | }
-   | - `c` dropped here while still borrowed
+   |  - `c` dropped here while still borrowed
 
 error[E0621]: explicit lifetime required in the type of `x`
   --> $DIR/without-precise-captures-we-are-powerless.rs:44:5

tests/ui/async-await/feature-self-return-type.stderr

@@ -9,7 +9,7 @@ LL |         Foo::new(&bar).await
    |                  ^^^^ borrowed value does not live long enough
 LL |
 LL |     };
-   |     - `bar` dropped here while still borrowed
+   |      - `bar` dropped here while still borrowed
 
 error: aborting due to 1 previous error
 

tests/ui/async-await/issue-74072-lifetime-name-annotations.stderr

@@ -57,7 +57,7 @@ LL | ||     })()
    | |_______|
    |         creates a temporary value which is freed while still in use
 LL |    }
-   |    - temporary value is freed at the end of this statement
+   |     - temporary value is freed at the end of this statement
 
 error[E0506]: cannot assign to `*x` because it is borrowed
   --> $DIR/issue-74072-lifetime-name-annotations.rs:27:9
@@ -106,7 +106,7 @@ LL | ||     })()
    | |_______|
    |         creates a temporary value which is freed while still in use
 LL |    }
-   |    - temporary value is freed at the end of this statement
+   |     - temporary value is freed at the end of this statement
 
 error[E0506]: cannot assign to `*x` because it is borrowed
   --> $DIR/issue-74072-lifetime-name-annotations.rs:35:9

tests/ui/borrowck/alias-liveness/escaping-bounds-2.stderr

@@ -2,7 +2,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/escaping-bounds-2.rs:10:31
    |
 LL |     let func = get_func::<T>(&String::new());
-   |                               ^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |                               ^^^^^^^^^^^^^  - temporary value is freed at the end of this statement
    |                               |
    |                               creates a temporary value which is freed while still in use
 LL |     drop(func);

tests/ui/borrowck/alias-liveness/higher-ranked-outlives-for-capture.stderr

@@ -7,7 +7,7 @@ LL |     test(&vec![])
    |     |     creates a temporary value which is freed while still in use
    |     argument requires that borrow lasts for `'static`
 LL | }
-   | - temporary value is freed at the end of this statement
+   |  - temporary value is freed at the end of this statement
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 

tests/ui/borrowck/already-borrowed-as-mutable-if-let-133941.stderr

@@ -11,7 +11,7 @@ LL |         foo.g();
    |         ^^^ second mutable borrow occurs here
 LL |
 LL |     }
-   |     - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |      - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
    |
 help: consider using the `matches!` macro
    |
@@ -32,7 +32,7 @@ LL |         foo.g();
    |         ^^^ second mutable borrow occurs here
 LL |
 LL |     }
-   |     - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |      - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
    |
 help: consider using the `matches!` macro
    |
@@ -52,7 +52,7 @@ LL |         foo.g();
    |         ^^^ second mutable borrow occurs here
 LL |
 LL |     }
-   |     - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |      - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
 
 error[E0499]: cannot borrow `foo` as mutable more than once at a time
   --> $DIR/already-borrowed-as-mutable-if-let-133941.rs:37:9
@@ -66,13 +66,13 @@ LL |         foo.g();
    |         ^^^ second mutable borrow occurs here
 LL |
 LL |     }
-   |     - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |      - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
 
 error[E0499]: cannot borrow `foo` as mutable more than once at a time
   --> $DIR/already-borrowed-as-mutable-if-let-133941.rs:40:45
    |
 LL |     while let Some(_x) = {let _x = foo.f(); foo.g(); None::<()>} {
-   |                                    ---      ^^^                - first borrow might be used here, when `_x` is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |                                    ---      ^^^                 - first borrow might be used here, when `_x` is dropped and runs the destructor for type `Option<Bar<'_>>`
    |                                    |        |
    |                                    |        second mutable borrow occurs here
    |                                    first mutable borrow occurs here
@@ -81,7 +81,7 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time
   --> $DIR/already-borrowed-as-mutable-if-let-133941.rs:43:42
    |
 LL |     if let Some(_x) = {let _x = foo.f(); foo.g(); None::<()>} {
-   |                                 ---      ^^^                - first borrow might be used here, when `_x` is dropped and runs the destructor for type `Option<Bar<'_>>`
+   |                                 ---      ^^^                 - first borrow might be used here, when `_x` is dropped and runs the destructor for type `Option<Bar<'_>>`
    |                                 |        |
    |                                 |        second mutable borrow occurs here
    |                                 first mutable borrow occurs here

tests/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr

@@ -2,7 +2,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-borrowed-uniq-rvalue-2.rs:20:20
    |
 LL |     let x = defer(&vec!["Goodbye", "world!"]);
-   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^  - temporary value is freed at the end of this statement
    |                    |
    |                    creates a temporary value which is freed while still in use
 LL |     x.x[0];

tests/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr

@@ -2,7 +2,7 @@ error[E0716]: temporary value dropped while borrowed
   --> $DIR/borrowck-borrowed-uniq-rvalue.rs:8:28
    |
 LL |     buggy_map.insert(42, &*Box::new(1));
-   |                            ^^^^^^^^^^^ - temporary value is freed at the end of this statement
+   |                            ^^^^^^^^^^^  - temporary value is freed at the end of this statement
    |                            |
    |                            creates a temporary value which is freed while still in use
 ...