rustc: Check LHS expression of assignment

Fixes #7507
Fixes #7508

2 files changed, 11 insertions, 1 deletions

diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs
index 50ab7825de6..7d8a6d15768 100644
--- a/src/librustc/middle/typeck/check/mod.rs
+++ b/src/librustc/middle/typeck/check/mod.rs
@@ -2366,6 +2366,11 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
         let result_t = fcx.expr_ty(expr);
         demand::suptype(fcx, expr.span, result_t, lhs_t);
 
+        let tcx = fcx.tcx();
+        if !ty::expr_is_lval(tcx, fcx.ccx.method_map, lhs) {
+            tcx.sess.span_err(lhs.span, "illegal left-hand side expression");
+        }
+
         // Overwrite result of check_binop...this preserves existing behavior
         // but seems quite dubious with regard to user-defined methods
         // and so forth. - Niko
@@ -2538,6 +2543,12 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
       }
       ast::ExprAssign(lhs, rhs) => {
         check_assignment(fcx, lhs, rhs, id);
+
+        let tcx = fcx.tcx();
+        if !ty::expr_is_lval(tcx, fcx.ccx.method_map, lhs) {
+            tcx.sess.span_err(lhs.span, "illegal left-hand side expression");
+        }
+
         let lhs_ty = fcx.expr_ty(lhs);
         let rhs_ty = fcx.expr_ty(rhs);
         if ty::type_is_error(lhs_ty) || ty::type_is_error(rhs_ty) {
diff --git a/src/test/compile-fail/borrowck-assign-to-constants.rs b/src/test/compile-fail/borrowck-assign-to-constants.rs
index f0dc28b736d..c0fb24c83e3 100644
--- a/src/test/compile-fail/borrowck-assign-to-constants.rs
+++ b/src/test/compile-fail/borrowck-assign-to-constants.rs
@@ -12,6 +12,5 @@ static foo: int = 5;
 
 fn main() {
     // assigning to various global constants
-    None = Some(3); //~ ERROR cannot assign to immutable static item
     foo = 6; //~ ERROR cannot assign to immutable static item
 }