[Isolates] Merge r 6300:6500 from bleeding_edge to isolates.

src/preparser.cc

+
 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 883 matching lines @@
     case i::Token::LBRACK:
       result = ParseArrayLiteral(CHECK_OK);
       break;
 
     case i::Token::LBRACE:
       result = ParseObjectLiteral(CHECK_OK);
       break;
 
     case i::Token::LPAREN:
       Consume(i::Token::LPAREN);
+      parenthesized_function_ = (peek() == i::Token::FUNCTION);
       result = ParseExpression(true, CHECK_OK);
       Expect(i::Token::RPAREN, CHECK_OK);
       if (result == kIdentifierExpression) result = kUnknownExpression;
       break;
 
     case i::Token::MOD:
       result = ParseV8Intrinsic(CHECK_OK);
       break;
 
     default: {
@@ skipping 157 matching lines @@
     }
   }
   Expect(i::Token::RPAREN, CHECK_OK);
 
   Expect(i::Token::LBRACE, CHECK_OK);
   int function_block_pos = scanner_->location().beg_pos;
 
   // Determine if the function will be lazily compiled.
   // Currently only happens to top-level functions.
   // Optimistically assume that all top-level functions are lazily compiled.
-  bool is_lazily_compiled =
-      (outer_scope_type == kTopLevelScope && !inside_with && allow_lazy_);
+  bool is_lazily_compiled = (outer_scope_type == kTopLevelScope &&
+                             !inside_with && allow_lazy_ &&
+                             !parenthesized_function_);
+  parenthesized_function_ = false;
 
   if (is_lazily_compiled) {
     log_->PauseRecording();
     ParseSourceElements(i::Token::RBRACE, ok);
     log_->ResumeRecording();
     if (!*ok) return kUnknownExpression;
 
     Expect(i::Token::RBRACE, CHECK_OK);
 
     // Position right after terminal '}'.
@@ skipping 95 matching lines @@
   if (scanner_->is_literal_ascii() && scanner_->literal_length() == 3) {
     const char* token = scanner_->literal_ascii_string().start();
     *is_get = strncmp(token, "get", 3) == 0;
     *is_set = !*is_get && strncmp(token, "set", 3) == 0;
   }
   return GetIdentifierSymbol();
 }
 
 #undef CHECK_OK
 } }  // v8::preparser