Fix ICE #3747

martinsp · martinsp · commit 391ee7987dca · 2019-02-23T21:38:16.000+02:00
[Martins Polakovs, John Firebaugh]
diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs
@@ -147,7 +147,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {
         }
 
         self.check_raw_ptr(cx, unsafety, decl, body, nodeid);
-        self.check_line_number(cx, span);
+        self.check_line_number(cx, span, body);
     }
 
     fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::TraitItem) {
@@ -178,12 +178,12 @@ impl<'a, 'tcx> Functions {
         }
     }
 
-    fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span) {
+    fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span, body: &'tcx hir::Body) {
         if in_external_macro(cx.sess(), span) {
             return;
         }
 
-        let code_snippet = snippet(cx, span, "..");
+        let code_snippet = snippet(cx, body.value.span, "..");
         let mut line_count: u64 = 0;
         let mut in_comment = false;
         let mut code_in_line;
diff --git a/tests/ui/crashes/ice-3747.rs b/tests/ui/crashes/ice-3747.rs
@@ -0,0 +1,17 @@
+/// Test for https://github.com/rust-lang/rust-clippy/issues/3747
+
+macro_rules! a {
+    ( $pub:tt $($attr:tt)* ) => {
+        $($attr)* $pub fn say_hello() {}
+    };
+}
+
+macro_rules! b {
+    () => {
+        a! { pub }
+    };
+}
+
+b! {}
+
+fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`self.check_raw_ptr(cx, unsafety, decl, body, nodeid);`
`150`		`- self.check_line_number(cx, span);`
	`150`	`+ self.check_line_number(cx, span, body);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::TraitItem) {`
`@@ -178,12 +178,12 @@ impl<'a, 'tcx> Functions {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`- fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span) {`
	`181`	`+ fn check_line_number(self, cx: &LateContext<'_, '_>, span: Span, body: &'tcx hir::Body) {`
`182`	`182`	`if in_external_macro(cx.sess(), span) {`
`183`	`183`	`return;`
`184`	`184`	`}`
`185`	`185`
`186`		`- let code_snippet = snippet(cx, span, "..");`
	`186`	`+ let code_snippet = snippet(cx, body.value.span, "..");`
`187`	`187`	`let mut line_count: u64 = 0;`
`188`	`188`	`let mut in_comment = false;`
`189`	`189`	`let mut code_in_line;`