3 files changed, 10 insertions, 8 deletions
diff --git a/Libraries/LibJS/AST.h b/Libraries/LibJS/AST.h
index e487c98d21..aa81e3927c 100644
--- a/Libraries/LibJS/AST.h
+++ b/Libraries/LibJS/AST.h
@@ -60,6 +60,7 @@ public:
     virtual bool is_scope_node() const { return false; }
     virtual bool is_program() const { return false; }
     virtual bool is_variable_declaration() const { return false; }
+    virtual bool is_call_expression() const { return false; }
     virtual bool is_new_expression() const { return false; }
 
 protected:
@@ -583,6 +584,7 @@ public:
 
 private:
     virtual const char* class_name() const override { return "CallExpression"; }
+    virtual bool is_call_expression() const override { return true; }
 
     struct ThisAndCallee {
         Value this_value;
@@ -603,6 +605,7 @@ public:
 
 private:
     virtual const char* class_name() const override { return "NewExpression"; }
+    virtual bool is_call_expression() const override { return false; }
     virtual bool is_new_expression() const override { return true; }
 };
 
diff --git a/Libraries/LibJS/Parser.cpp b/Libraries/LibJS/Parser.cpp
index d7cb24a16a..1622220c81 100644
--- a/Libraries/LibJS/Parser.cpp
+++ b/Libraries/LibJS/Parser.cpp
@@ -755,6 +755,10 @@ NonnullRefPtr<Expression> Parser::parse_secondary_expression(NonnullRefPtr<Expre
         return parse_call_expression(move(lhs));
     case TokenType::Equals:
         consume();
+        if (!lhs->is_identifier() && !lhs->is_member_expression() && !lhs->is_call_expression()) {
+            syntax_error("Invalid left-hand side in assignment");
+            return create_ast_node<ErrorExpression>();
+        }
         return create_ast_node<AssignmentExpression>(AssignmentOp::Assignment, move(lhs), parse_expression(min_precedence, associativity));
     case TokenType::Period:
         consume();
diff --git a/Libraries/LibJS/Tests/invalid-lhs-in-assignment.js b/Libraries/LibJS/Tests/invalid-lhs-in-assignment.js
index 5bca7137b6..e758ac767f 100644
--- a/Libraries/LibJS/Tests/invalid-lhs-in-assignment.js
+++ b/Libraries/LibJS/Tests/invalid-lhs-in-assignment.js
@@ -1,22 +1,17 @@
 load("test-common.js");
 
 try {
-    assertThrowsError(() => {
-        512 = 256;
-    }, {
-        error: ReferenceError,
-        message: "Invalid left-hand side in assignment"
-    });
+    function foo() { }
 
     assertThrowsError(() => {
-        512 = 256;
+        foo() = "foo";
     }, {
         error: ReferenceError,
         message: "Invalid left-hand side in assignment"
     });
 
     assertThrowsError(() => {
-        "hello world" = "another thing?";
+        (function () { })() = "foo";
     }, {
         error: ReferenceError,
         message: "Invalid left-hand side in assignment"