---

yaml
---
r: 3983
b: refs/heads/master
c: b6fc86a
h: refs/heads/master
i:
  3981: 29a9ef0
  3979: 3c065b8
  3975: a6e94f9
  3967: a59c27b
v: v3

Author: lkuper

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b0aa5c5cf92804219766e3254fc89a3fc583b0
+refs/heads/master: b6fc86ae5ac9586bc2989ee0351895873abb9101

trunk/src/comp/middle/typeck.rs

@@ -2092,7 +2092,7 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
         }
         case (ast::expr_self_method(?ident)) {
             auto t = ty::mk_nil(fcx.ccx.tcx);
-            let ty::t this_obj_ty;
+            let ty::t this_obj_ty = ty::mk_nil(fcx.ccx.tcx);
             let option::t[obj_info] this_obj_info = get_obj_info(fcx.ccx);
             alt (this_obj_info) {
                 case (
@@ -2106,7 +2106,12 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
                         ty::lookup_item_type(fcx.ccx.tcx,
                                              local_def(obj_info.this_obj))._1;
                 }
-                case (none) { fail; }
+                case (none) {
+                    // Shouldn't happen.
+                    fcx.ccx.tcx.sess.span_err(expr.span,
+                                              "self-call in non-object \
+                                               context");
+                }
             }
             // Grab this method's type out of the current object type.
 

trunk/src/test/compile-fail/self-call-non-obj.rs

@@ -0,0 +1,14 @@
+//xfail-stage0
+
+// error-pattern:self-call in non-object context
+
+// Fix for issue #707.
+fn main() {
+
+    fn foo() -> int {
+        ret 3();
+    }
+
+    self.foo();
+
+}