fix AddValidation on methods

diff --git a/src/librustc_mir/transform/add_validation.rs b/src/librustc_mir/transform/add_validation.rs
index 86a86f4934caa0c683fd40b934d695af3a3cba55..a3ec6af76034e49dee765b50b9d9b380ba2b6d55 100644 (file)
--- a/src/librustc_mir/transform/add_validation.rs
+++ b/src/librustc_mir/transform/add_validation.rs
@@ -85,19 +85,25 @@ fn lval_context<'a, 'tcx, D>(
 /// Check if this function contains an unsafe block or is an unsafe function.
 fn fn_contains_unsafe<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, src: MirSource) -> bool {
     use rustc::hir::intravisit::{self, Visitor};
+    use rustc::hir::map::Node;
 
     let fn_node_id = match src {
         MirSource::Fn(node_id) => node_id,
         _ => return false, // only functions can have unsafe
     };
-    let fn_item = tcx.hir.expect_item(fn_node_id);
 
     struct FindUnsafe<'b, 'tcx> where 'tcx : 'b {
         map: &'b hir::map::Map<'tcx>,
         found_unsafe: bool,
     }
     let mut finder = FindUnsafe { map: &tcx.hir, found_unsafe: false };
-    finder.visit_item(fn_item);
+    // Run the visitor on the NodeId we got.  Seems like there is no uniform way to do that.
+    match tcx.hir.find(fn_node_id) {
+        Some(Node::NodeItem(item)) => finder.visit_item(item),
+        Some(Node::NodeImplItem(item)) => finder.visit_impl_item(item),
+        Some(_) | None =>
+            bug!("Expected method or function, found {}", tcx.hir.node_to_string(fn_node_id)),
+    };
 
     impl<'b, 'tcx> Visitor<'tcx> for FindUnsafe<'b, 'tcx> {
         fn nested_visit_map<'this>(&'this mut self) -> intravisit::NestedVisitorMap<'this, 'tcx> {

diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs
index 4a143c4cee9e2a198291c63b3839c44c8bc91079..c8ea2bc254470654e8eaf71860a6767ad75c14f7 100644 (file)
--- a/src/test/mir-opt/validate_1.rs
+++ b/src/test/mir-opt/validate_1.rs
@@ -11,39 +11,42 @@
 // ignore-tidy-linelength
 // compile-flags: -Z verbose -Z mir-emit-validate=1
 
-fn foo(_x: &mut i32) {}
+struct Test;
+
+impl Test {
+    // Make sure we run the pass on a method, not just on bare functions.
+    fn foo(&self, _x: &mut i32) {}
+}
 
 fn main() {
     let mut x = 0;
-    foo(&mut x);
+    Test.foo(&mut x);
 }
 
 // END RUST SOURCE
-// START rustc.node4.EraseRegions.after.mir
-// fn foo(_1: &ReErased mut i32) -> () {
+// START rustc.node10.EraseRegions.after.mir
 //     bb0: {
-//         Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(3) => validate_1/8cd878b::foo[0] }, BrAnon(0)) mut i32]);
+//         Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(5) => validate_1/8cd878b::{{impl}}[0]::foo[0] }, BrAnon(0)) Test, _2: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(5) => validate_1/8cd878b::{{impl}}[0]::foo[0] }, BrAnon(1)) mut i32]);
 //         return;
 //     }
-// }
-// END rustc.node4.EraseRegions.after.mir
-// START rustc.node11.EraseRegions.after.mir
+// END rustc.node10.EraseRegions.after.mir
+// START rustc.node21.EraseRegions.after.mir
 // fn main() -> () {
 //     bb0: {
-//         Validate(Suspend(ReScope(Misc(NodeId(20)))), [_1: i32]);
-//         _4 = &ReErased mut _1;
-//         Validate(Acquire, [(*_4): i32/ReScope(Misc(NodeId(20)))]);
-//         Validate(Suspend(ReScope(Misc(NodeId(20)))), [(*_4): i32/ReScope(Misc(NodeId(20)))]);
-//         _3 = &ReErased mut (*_4);
-//         Validate(Acquire, [(*_3): i32/ReScope(Misc(NodeId(20)))]);
-//         Validate(Release, [_3: &ReScope(Misc(NodeId(20))) mut i32]);
-//         _2 = const foo(_3) -> bb1;
+//         Validate(Suspend(ReScope(Misc(NodeId(30)))), [_1: i32]);
+//         _6 = &ReErased mut _1;
+//         Validate(Acquire, [(*_6): i32/ReScope(Misc(NodeId(30)))]);
+//         Validate(Suspend(ReScope(Misc(NodeId(30)))), [(*_6): i32/ReScope(Misc(NodeId(30)))]);
+//         _5 = &ReErased mut (*_6);
+//         Validate(Acquire, [(*_5): i32/ReScope(Misc(NodeId(30)))]);
+//         Validate(Release, [_3: &ReScope(Misc(NodeId(30))) Test, _5: &ReScope(Misc(NodeId(30))) mut i32]);
+//         _2 = const Test::foo(_3, _5) -> bb1;
 //     }
 //
 //     bb1: {
 //         Validate(Acquire, [_2: ()]);
-//         EndRegion(ReScope(Misc(NodeId(20))));
+//         EndRegion(ReScope(Misc(NodeId(30))));
 //         return;
 //     }
 // }
-// END rustc.node11.EraseRegions.after.mir
+// END rustc.node21.EraseRegions.after.mir