diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2017-09-08 20:22:50 -0400 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2017-09-08 20:22:50 -0400 |
| commit | 07becc5f2438a2f628e8cb5d5a6128dd9ed2cc31 (patch) | |
| tree | 9cdfcf01e197a5d611a7f4959be7e0ba6eec88de /src/rustllvm/RustWrapper.cpp | |
| parent | dead08cb331343b84564628b139b657f93548320 (diff) | |
| download | rust-07becc5f2438a2f628e8cb5d5a6128dd9ed2cc31.tar.gz rust-07becc5f2438a2f628e8cb5d5a6128dd9ed2cc31.zip | |
Fix regression in promotion of rvalues referencing a static
This commit makes librustc_passes::consts::CheckCrateVisitor properly mark expressions as promotable if they reference a static, as it's perfectly fine for one static to reference another. It fixes a regression that prevented a temporary rvalue from referencing a static if it was itself declared within a static. Prior to commit https://github.com/rust-lang/rust/commit/b8c05fe90bc, `region::ScopeTree` would only register a 'terminating scope' for function bodies. Thus, while rvalues in a static that referenced a static would be marked unpromotable, the lack of enclosing scope would cause mem_categorization::MemCategorizationContext::cat_rvalue_node to compute a 'temporary scope' of `ReStatic`. Since this had the same effect as explicitly selecting a scope of `ReStatic` due to the rvalue being marked by CheckCrateVisitor as promotable, no issue occurred. However, commit https://github.com/rust-lang/rust/commit/b8c05fe90bc made ScopeTree unconditionally register a 'terminating scope' Since mem_categorization would now compute a non-static 'temporary scope', the aforementioned rvalues would be erroneously marked as living for too short a time. By fixing the behavior of CheckCrateVisitor, this commit avoids changing mem_categorization's behavior, while ensuring that temporary values in statics are still allowed to reference other statics. Fixes issue #44373
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions
