diff options
| author | bors <bors@rust-lang.org> | 2020-01-27 15:30:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-27 15:30:31 +0000 |
| commit | 5e1a799842ba6ed4a57e91f7ab9435947482f7d8 (patch) | |
| tree | 322e3c225bae8356189d398766651ba7d96ba0d0 /src/librustc_mir/build | |
| parent | 3f41b032eef8b749409b529225f22571075a8aeb (diff) | |
| parent | 4600d3c594a6ea68aaa944386d14f0c20179861e (diff) | |
| download | rust-1.41.0.tar.gz rust-1.41.0.zip | |
Auto merge of #68568 - pietroalbini:stable-next, r=pietroalbini 1.41.0
[stable] Rust 1.41.0 stable release This PR produces the 1.41.0 stable release, backporting the following PRs as well: * #68494: Make pointers to statics internal * #67928: Update RELEASES.md for 1.41.0 r? @ghost
Diffstat (limited to 'src/librustc_mir/build')
| -rw-r--r-- | src/librustc_mir/build/expr/as_temp.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_mir/build/expr/as_temp.rs b/src/librustc_mir/build/expr/as_temp.rs index 4dad9ab498f..169b71f281c 100644 --- a/src/librustc_mir/build/expr/as_temp.rs +++ b/src/librustc_mir/build/expr/as_temp.rs @@ -66,6 +66,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { } if let ExprKind::StaticRef { def_id, .. } = expr.kind { let is_thread_local = this.hir.tcx().has_attr(def_id, sym::thread_local); + local_decl.internal = true; local_decl.local_info = LocalInfo::StaticRef {def_id, is_thread_local }; } this.local_decls.push(local_decl) |