Merge r9430, r9433, r9508 and 9615 into 3.6 branch.

src/parser.cc

Index: src/parser.cc
===================================================================
--- src/parser.cc	(revision 9634)
+++ src/parser.cc	(working copy)
@@ -1753,6 +1753,8 @@
           value->AsCall() == NULL &&
           value->AsCallNew() == NULL) {
         fni_->Infer();
+      } else {
+        fni_->RemoveLastFunction();
       }
     }
 
@@ -2503,6 +2505,8 @@
          || op == Token::ASSIGN)
         && (right->AsCall() == NULL && right->AsCallNew() == NULL)) {
       fni_->Infer();
+    } else {
+      fni_->RemoveLastFunction();
     }
     fni_->Leave();
   }