nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly lift empty lists of clauses and goals

Browse Source
This commit is contained in:
scalexm 2018-11-23 19:47:22 +01:00
parent 37ef0c38b7
commit 8cadd59674
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/ty/context.rs
View File

@ -1714,6 +1714,10 @@ impl<'a, 'tcx> Lift<'tcx> for &'a List<Goal<'a>> {
&self, &self,
tcx: TyCtxt<'b, 'gcx, 'tcx>, tcx: TyCtxt<'b, 'gcx, 'tcx>,
) -> Option<&'tcx List<Goal<'tcx>>> { ) -> Option<&'tcx List<Goal<'tcx>>> {
if self.is_empty() {
return Some(List::empty());
}
if tcx.interners.arena.in_arena(*self as *const _) { if tcx.interners.arena.in_arena(*self as *const _) {
return Some(unsafe { mem::transmute(*self) }); return Some(unsafe { mem::transmute(*self) });
} }
@ -1732,6 +1736,10 @@ impl<'a, 'tcx> Lift<'tcx> for &'a List<Clause<'a>> {
&self, &self,
tcx: TyCtxt<'b, 'gcx, 'tcx>, tcx: TyCtxt<'b, 'gcx, 'tcx>,
) -> Option<&'tcx List<Clause<'tcx>>> { ) -> Option<&'tcx List<Clause<'tcx>>> {
if self.is_empty() {
return Some(List::empty());
}
if tcx.interners.arena.in_arena(*self as *const _) { if tcx.interners.arena.in_arena(*self as *const _) {
return Some(unsafe { mem::transmute(*self) }); return Some(unsafe { mem::transmute(*self) });
} }