Default methods with self-calls make it as far as trans.

2 files changed, 21 insertions, 3 deletions

diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index 4e47b752449..9dd2cec043c 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/src/rustc/middle/typeck/check/method.rs
@@ -140,6 +140,26 @@ struct lookup {
               ty::ty_class(did, substs) => {
                 self.add_candidates_from_class(did, substs);
               }
+              ty::ty_self => {
+                // Call is of the form "self.foo()" and appears in one
+                // of a trait's provided methods.
+                let self_def_id = match self.fcx.self_info {
+                  some(self_info) => self_info.def_id,
+                  none => {
+                    // Shouldn't happen; there should always be a
+                    // self_info in this case.
+                    self.tcx().sess.bug(~"unexpected `none` for self_info")
+                  }
+                };
+
+                let substs = {
+                    self_r: none,
+                    self_ty: none,
+                    tps: ~[],
+                };
+
+                self.add_candidates_from_trait(self_def_id, substs);
+              }
               _ => ()
             }
 
diff --git a/src/test/run-pass/traits-default-method-self.rs b/src/test/run-pass/traits-default-method-self.rs
index 0c4c993611f..c1ecaa5fa15 100644
--- a/src/test/run-pass/traits-default-method-self.rs
+++ b/src/test/run-pass/traits-default-method-self.rs
@@ -1,8 +1,6 @@
 //xfail-test
 
-// Right now, this fails with "attempted access of field `purr` on
-// type `self`, but no public field or method with that name was
-// found".
+// Currently failing with an ICE in trans.
 
 trait Cat {
     fn meow() -> bool;