Patch for allowing several V8 instances in process:...

src/compiler.cc

 // Copyright 2009 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 23 matching lines @@
 #include "debug.h"
 #include "fast-codegen.h"
 #include "oprofile-agent.h"
 #include "rewriter.h"
 #include "scopes.h"
 #include "usage-analyzer.h"
 
 namespace v8 {
 namespace internal {
 
+CompilerData::CompilerData() {}
 
 class CodeGenSelector: public AstVisitor {
  public:
   enum CodeGenTag { NORMAL, FAST };
 
   CodeGenSelector()
       : has_supported_syntax_(true),
         context_(Expression::kUninitialized) {
   }
 
@@ skipping 37 matching lines @@
   if (!Rewriter::Process(literal) || !AnalyzeVariableUsage(literal)) {
     // Signal a stack overflow by returning a null handle.  The stack
     // overflow exception will be thrown by the caller.
     return Handle<Code>::null();
   }
 
   {
     // Compute top scope and allocate variables. For lazy compilation
     // the top scope only contains the single lazily compiled function,
     // so this doesn't re-allocate variables repeatedly.
-    HistogramTimerScope timer(&Counters::variable_allocation);
+    HistogramTimerScope timer(&COUNTER(variable_allocation));
     Scope* top = literal->scope();
     while (top->outer_scope() != NULL) top = top->outer_scope();
     top->AllocateVariables(context);
   }
 
 #ifdef DEBUG
   if (Bootstrapper::IsActive() ?
       FLAG_print_builtin_scopes :
       FLAG_print_scopes) {
     literal->scope()->Print();
@@ skipping 101 matching lines @@
     SetElement(args, 0, source);
     Handle<Object> result = Factory::NewSyntaxError("invalid_json", args);
     Top::Throw(*result, NULL);
     return Handle<JSFunction>::null();
   }
 
   // Measure how long it takes to do the compilation; only take the
   // rest of the function into account to avoid overlap with the
   // parsing statistics.
   HistogramTimer* rate = is_eval
-      ? &Counters::compile_eval
-      : &Counters::compile;
+      ? &COUNTER(compile_eval)
+      : &COUNTER(compile);
   HistogramTimerScope timer(rate);
 
   // Compile the code.
   Handle<Code> code = MakeCode(lit, script, context, is_eval,
                                Handle<SharedFunctionInfo>::null());
 
   // Check for stack-overflow exceptions.
   if (code.is_null()) {
     Top::StackOverflow();
     return Handle<JSFunction>::null();
@@ skipping 36 matching lines @@
   SetExpectedNofPropertiesFromEstimate(fun, lit->expected_property_count());
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Notify debugger
   Debugger::OnAfterCompile(script, fun);
 #endif
 
   return fun;
 }
 
-
-static StaticResource<SafeStringInputBuffer> safe_string_input_buffer;
-
-
 Handle<JSFunction> Compiler::Compile(Handle<String> source,
                                      Handle<Object> script_name,
                                      int line_offset, int column_offset,
                                      v8::Extension* extension,
                                      ScriptDataImpl* input_pre_data) {
   int source_length = source->length();
-  Counters::total_load_size.Increment(source_length);
-  Counters::total_compile_size.Increment(source_length);
+  INCREMENT_COUNTER(total_load_size, source_length);
+  INCREMENT_COUNTER(total_compile_size, source_length);
 
   // The VM is in the COMPILER state until exiting this function.
   VMState state(COMPILER);
 
   // Do a lookup in the compilation cache but not for extensions.
   Handle<JSFunction> result;
   if (extension == NULL) {
     result = CompilationCache::LookupScript(source,
                                             script_name,
                                             line_offset,
                                             column_offset);
   }
 
   if (result.is_null()) {
     // No cache entry found. Do pre-parsing and compile the script.
     ScriptDataImpl* pre_data = input_pre_data;
     if (pre_data == NULL && source_length >= FLAG_min_preparse_length) {
-      Access<SafeStringInputBuffer> buf(&safe_string_input_buffer);
+      Access<SafeStringInputBuffer> buf(
+        &v8_context()->compiler_data_.safe_string_input_buffer_);
       buf->Reset(source.location());
       pre_data = PreParse(source, buf.value(), extension);
     }
 
     // Create a script object describing the script to be compiled.
     Handle<Script> script = Factory::NewScript(source);
     if (!script_name.is_null()) {
       script->set_name(*script_name);
       script->set_line_offset(Smi::FromInt(line_offset));
       script->set_column_offset(Smi::FromInt(column_offset));
@@ skipping 24 matching lines @@
 
 Handle<JSFunction> Compiler::CompileEval(Handle<String> source,
                                          Handle<Context> context,
                                          bool is_global,
                                          ValidationState validate) {
   // Note that if validation is required then no path through this
   // function is allowed to return a value without validating that
   // the input is legal json.
 
   int source_length = source->length();
-  Counters::total_eval_size.Increment(source_length);
-  Counters::total_compile_size.Increment(source_length);
+  INCREMENT_COUNTER(total_eval_size, source_length);
+  INCREMENT_COUNTER(total_compile_size, source_length);
 
   // The VM is in the COMPILER state until exiting this function.
   VMState state(COMPILER);
 
   // Do a lookup in the compilation cache; if the entry is not there,
   // invoke the compiler and add the result to the cache.  If we're
   // evaluating json we bypass the cache since we can't be sure a
   // potential value in the cache has been validated.
   Handle<JSFunction> result;
   if (validate == DONT_VALIDATE_JSON)
@@ skipping 29 matching lines @@
 
   PostponeInterruptsScope postpone;
 
   // Compute name, source code and script data.
   Handle<String> name(String::cast(shared->name()));
   Handle<Script> script(Script::cast(shared->script()));
 
   int start_position = shared->start_position();
   int end_position = shared->end_position();
   bool is_expression = shared->is_expression();
-  Counters::total_compile_size.Increment(end_position - start_position);
+  INCREMENT_COUNTER(total_compile_size, end_position - start_position);
 
   // Generate the AST for the lazily compiled function. The AST may be
   // NULL in case of parser stack overflow.
   FunctionLiteral* lit = MakeLazyAST(script, name,
                                      start_position,
                                      end_position,
                                      is_expression);
 
   // Check for parse errors.
   if (lit == NULL) {
     ASSERT(Top::has_pending_exception());
     return false;
   }
 
   // Update the loop nesting in the function literal.
   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.
-  HistogramTimerScope timer(&Counters::compile_lazy);
+  HistogramTimerScope timer(&COUNTER(compile_lazy));
 
   // Compile the code.
   Handle<Code> code = MakeCode(lit, script, Handle<Context>::null(), false,
                                shared);
 
   // Check for stack-overflow exception.
   if (code.is_null()) {
     Top::StackOverflow();
     return false;
   }
@@ skipping 674 matching lines @@
 
 void CodeGenSelector::VisitThisFunction(ThisFunction* expr) {
   BAILOUT("ThisFunction");
 }
 
 #undef BAILOUT
 #undef CHECK_BAILOUT
 
 
 } }  // namespace v8::internal