---

yaml
---
r: 144264
b: refs/heads/try2
c: ad6eeb8
h: refs/heads/master
v: v3

Author: msullivan

[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: 97d2b44f8749479fdf1ba92d1cada6ae8594cf54
+refs/heads/try2: ad6eeb843b3f21bd51bc6d89d58a75367b7439df
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/method.rs

@@ -938,9 +938,18 @@ impl<'self> LookupContext<'self> {
 
         // static methods should never have gotten this far:
         assert!(candidate.method_ty.explicit_self != sty_static);
-        let transformed_self_ty =
-            ty::subst(tcx, &candidate.rcvr_substs,
-                      candidate.method_ty.transformed_self_ty.unwrap());
+
+        let transformed_self_ty = match candidate.origin {
+            method_object(*) => {
+                // For annoying reasons, we've already handled the
+                // substitution for object calls.
+                candidate.method_ty.transformed_self_ty.unwrap()
+            }
+            _ => {
+                ty::subst(tcx, &candidate.rcvr_substs,
+                          candidate.method_ty.transformed_self_ty.unwrap())
+            }
+        };
 
         // Determine the values for the type parameters of the method.
         // If they were not explicitly supplied, just construct fresh

branches/try2/src/test/run-pass/trait-object-generics.rs

@@ -8,6 +8,26 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// test for #8664
+
+pub trait Trait2<A> {
+    fn doit(&self);
+}
+
+pub struct Impl<A1, A2, A3> {
+    /*
+     * With A2 we get the ICE:
+     * task <unnamed> failed at 'index out of bounds: the len is 1 but the index is 1', /home/tortue/rust_compiler_newest/src/librustc/middle/subst.rs:58
+     */
+    t: ~Trait2<A2>
+}
+
+impl<A1, A2, A3> Impl<A1, A2, A3> {
+    pub fn step(&self) {
+        self.t.doit()
+    }
+}
+
 // test for #8601
 
 enum Type<T> { Constant }