---

yaml
---
r: 153973
b: refs/heads/try2
c: bd15854
h: refs/heads/master
i:
  153971: 69cebae
v: v3

Author: luqmana

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: fd08d5fb2e4a466336419ad03501c85399e72429
+refs/heads/try2: bd158541143dd5677663c1e77b3079d1078169af
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/subst.rs

@@ -584,9 +584,11 @@ impl<'a> TypeFolder for SubstFolder<'a> {
                                 self.tcx().sess.span_bug(
                                     span,
                                     format!("Type parameter out of range \
-                                     when substituting in region {} (root type={})",
+                                     when substituting in region {} (root type={}) \
+                                     (space={}, index={})",
                                     region_name.as_str(),
-                                    self.root_ty.repr(self.tcx())).as_slice());
+                                    self.root_ty.repr(self.tcx()),
+                                    space, i).as_slice());
                             }
                         }
                 }

branches/try2/src/librustc/middle/trans/base.rs

@@ -485,6 +485,9 @@ pub fn get_res_dtor(ccx: &CrateContext,
     if !substs.types.is_empty() {
         assert_eq!(did.krate, ast::LOCAL_CRATE);
 
+        // Since we're in trans we don't care for any region parameters
+        let ref substs = subst::Substs::erased(substs.types.clone());
+
         let vtables = typeck::check::vtable::trans_resolve_method(ccx.tcx(), did.node, substs);
         let (val, _) = monomorphize::monomorphic_fn(ccx, did, substs, vtables, None);
 

branches/try2/src/test/run-pass/issue-15858.rs

@@ -0,0 +1,45 @@
+// Copyright 2012-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.
+
+#![feature(unsafe_destructor)]
+
+static mut DROP_RAN: bool = false;
+
+trait Bar<'b> {
+    fn do_something(&mut self);
+}
+
+struct BarImpl<'b>;
+
+impl<'b> Bar<'b> for BarImpl<'b> {
+    fn do_something(&mut self) {}
+}
+
+
+struct Foo<B>;
+
+#[unsafe_destructor]
+impl<'b, B: Bar<'b>> Drop for Foo<B> {
+    fn drop(&mut self) {
+        unsafe {
+            DROP_RAN = true;
+        }
+    }
+}
+
+
+fn main() {
+    {
+       let _x: Foo<BarImpl> = Foo;
+    }
+    unsafe {
+        assert_eq!(DROP_RAN, true);
+    }
+}