Checking and reporting for stack overflow in the right places.

src/compiler.cc

 // Copyright 2006-2008 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 56 matching lines @@
 
   // Optimize the AST.
   if (!Rewriter::Optimize(literal)) {
     // Signal a stack overflow by returning a null handle.  The stack
     // overflow exception will be thrown by the caller.
     return Handle<Code>::null();
   }
 
   // Generate code and return it.
   Handle<Code> result = CodeGenerator::MakeCode(literal, script, is_eval);
-  // Check for stack-overflow exception.
-  if (result.is_null()) {
-    Top::StackOverflow();
-    Top::ReportPendingMessages();
-  }
   return result;
 }
 
 
 static Handle<JSFunction> MakeFunction(bool is_global,
                                        bool is_eval,
                                        Handle<Script> script,
                                        v8::Extension* extension,
                                        ScriptDataImpl* pre_data) {
   ZoneScope zone_scope(DELETE_ON_EXIT);
@@ skipping 24 matching lines @@
   StatsRate* rate = is_eval
       ? &Counters::compile_eval
       : &Counters::compile;
   StatsRateScope timer(rate);
 
   // Compile the code.
   Handle<Code> code = MakeCode(lit, script, is_eval);
 
   // Check for stack-overflow exceptions.
   if (code.is_null()) {
+    Top::StackOverflow();
+    Top::ReportPendingMessages();
     return Handle<JSFunction>::null();
   }
 
   if (script->name()->IsString()) {
     SmartPointer<char> data =
         String::cast(script->name())->ToCString(DISALLOW_NULLS);
     LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, *data));
   } else {
     LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, ""));
   }
@@ skipping 68 matching lines @@
     if (extension == NULL && !result.is_null()) {
       CompilationCache::PutFunction(source, CompilationCache::SCRIPT, result);
     }
 
     // Get rid of the pre-parsing data (if necessary).
     if (input_pre_data == NULL && pre_data != NULL) {
       delete pre_data;
     }
   }
 
-  if (result.is_null()) Top::ReportPendingMessages();
-
   return result;
 }
 
 
 Handle<JSFunction> Compiler::CompileEval(Handle<String> source,
                                          int line_offset,
                                          bool is_global) {
   int source_length = source->length();
   Counters::total_eval_size.Increment(source_length);
   Counters::total_compile_size.Increment(source_length);
@@ skipping 10 matching lines @@
   if (result.is_null()) {
     // Create a script object describing the script to be compiled.
     Handle<Script> script = Factory::NewScript(source);
     script->set_line_offset(Smi::FromInt(line_offset));
     result = MakeFunction(is_global, true, script, NULL, NULL);
     if (!result.is_null()) {
       CompilationCache::PutFunction(source, entry, result);
     }
   }
 
-  if (result.is_null()) Top::ReportPendingMessages();
-
   return result;
 }
 
 
 bool Compiler::CompileLazy(Handle<SharedFunctionInfo> shared,
                            int loop_nesting) {
   ZoneScope zone_scope(DELETE_ON_EXIT);
 
   // The VM is in the COMPILER state until exiting this function.
   VMState state(COMPILER);
@@ skipping 29 matching lines @@
   lit->set_loop_nesting(loop_nesting);
 
   // Measure how long it takes to do the lazy compilation; only take
   // the rest of the function into account to avoid overlap with the
   // lazy parsing statistics.
   StatsRateScope timer(&Counters::compile_lazy);
 
   // Compile the code.
   Handle<Code> code = MakeCode(lit, script, false);
 
+  // Check for stack-overflow exception.
   if (code.is_null()) {
+    Top::StackOverflow();
+    Top::ReportPendingMessages();
     return false;
   }
 
   // Generate the code, update the function info, and return the code.
   LOG(CodeCreateEvent("LazyCompile", *code, *lit->name()));
 
   // Update the shared function info with the compiled code.
   shared->set_code(*code);
 
   // Set the expected number of properties for instances.
   SetExpectedNofPropertiesFromEstimate(shared, lit->expected_property_count());
 
   // Check the function has compiled code.
   ASSERT(shared->is_compiled());
   return true;
 }
 
 
 } }  // namespace v8::internal