From 949dbc11ffe5767ae744d40b7eb4b5fa9204b9b1 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sat, 1 Nov 2014 19:07:51 -0700
Subject: [PATCH] Add regression test for #18501

---
 src/test/auxiliary/issue-18501.rs | 27 +++++++++++++++++++++++++++
 src/test/run-pass/issue-18501.rs  | 20 ++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 src/test/auxiliary/issue-18501.rs
 create mode 100644 src/test/run-pass/issue-18501.rs

diff --git a/src/test/auxiliary/issue-18501.rs b/src/test/auxiliary/issue-18501.rs
new file mode 100644
index 00000000000..af3bc20378c
--- /dev/null
+++ b/src/test/auxiliary/issue-18501.rs
@@ -0,0 +1,27 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type = "rlib"]
+struct Foo;
+
+trait Tr {
+    fn tr(&self);
+}
+
+impl Tr for Foo {
+    fn tr(&self) {}
+}
+
+fn take_method<T>(f: fn(&T), t: &T) {}
+
+#[inline]
+pub fn pass_method() {
+    take_method(Tr::tr, &Foo);
+}
diff --git a/src/test/run-pass/issue-18501.rs b/src/test/run-pass/issue-18501.rs
new file mode 100644
index 00000000000..ce026942948
--- /dev/null
+++ b/src/test/run-pass/issue-18501.rs
@@ -0,0 +1,20 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that we don't ICE when inlining a function from another
+// crate that uses a trait method as a value due to incorrectly
+// translating the def ID of the trait during AST decoding.
+
+// aux-build:issue-18501.rs
+extern crate "issue-18501" as issue;
+
+fn main() {
+    issue::pass_method();
+}
-- 
GitLab