MERGEME post rebase fix to impl BitDenotation for Borrows.

pnkfelix · pnkfelix · commit cdced4fccb99 · 2017-03-14T12:45:24.000+01:00
diff --git a/src/librustc_borrowck/borrowck/mir/dataflow/impls.rs b/src/librustc_borrowck/borrowck/mir/dataflow/impls.rs
@@ -606,6 +606,7 @@ impl<'a, 'tcx> BitDenotation for Borrows<'a, 'tcx> {
                 }
             }
 
+            mir::StatementKind::InlineAsm { .. } |
             mir::StatementKind::SetDiscriminant { .. } |
             mir::StatementKind::StorageLive(..) |
             mir::StatementKind::StorageDead(..) |

Original file line number	Diff line number	Diff line change
`@@ -606,6 +606,7 @@ impl<'a, 'tcx> BitDenotation for Borrows<'a, 'tcx> {`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`
	`609`	`+ mir::StatementKind::InlineAsm { .. } \|`
`609`	`610`	`mir::StatementKind::SetDiscriminant { .. } \|`
`610`	`611`	`mir::StatementKind::StorageLive(..) \|`
`611`	`612`	`mir::StatementKind::StorageDead(..) \|`