From cf7756442f94a94bbb0b559ae8eb9b97031d8d13 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sat, 1 Nov 2014 20:15:48 -0700
Subject: [PATCH 1/2] Always consider static methods object-safe

This also fixes #18490 as a side-effect by avoiding a later
out-of-bounds slice.
---
 src/librustc/middle/typeck/check/vtable.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs
index a17194f008565..87b0aed4ac49c 100644
--- a/src/librustc/middle/typeck/check/vtable.rs
+++ b/src/librustc/middle/typeck/check/vtable.rs
@@ -187,7 +187,11 @@ pub fn check_object_safety(tcx: &ty::ctxt, object_trait: &ty::TyTrait, span: Spa
                                    receiver through a trait object", method_name))
             }
 
-            ty::StaticExplicitSelfCategory |
+            ty::StaticExplicitSelfCategory => {
+                // Static methods are always object-safe since they
+                // can't be called through a trait object
+                return msgs
+            }
             ty::ByReferenceExplicitSelfCategory(..) |
             ty::ByBoxExplicitSelfCategory => {}
         }

From 107af281037e77fbb322b63895fa68dadac61e53 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sat, 1 Nov 2014 20:21:55 -0700
Subject: [PATCH 2/2] Add regression test

---
 src/test/run-pass/trait-object-safety.rs | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/test/run-pass/trait-object-safety.rs

diff --git a/src/test/run-pass/trait-object-safety.rs b/src/test/run-pass/trait-object-safety.rs
new file mode 100644
index 0000000000000..929cb9e7f1759
--- /dev/null
+++ b/src/test/run-pass/trait-object-safety.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.
+
+// Check that object-safe methods are identified as such.  Also
+// acts as a regression test for #18490
+
+trait Tr {
+    // Static methods are always safe regardless of other rules
+    fn new() -> Self;
+}
+
+struct St;
+
+impl Tr for St {
+    fn new() -> St { St }
+}
+
+fn main() {
+    &St as &Tr;
+}