Speed up access to global variables from eval scopes. Traverse the...

src/compilation-cache.cc

 // Copyright 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 84 matching lines @@
     result = table->Lookup(*source);
   }
   if (result->IsJSFunction()) {
     return Handle<JSFunction>(JSFunction::cast(result));
   } else {
     return Handle<JSFunction>::null();
   }
 }
 
 
+static Handle<JSFunction> Lookup(Handle<String> source,
+                                 Handle<Context> context,
+                                 CompilationCache::Entry entry) {
+  // Make sure not to leak the table into the surrounding handle
+  // scope. Otherwise, we risk keeping old tables around even after
+  // having cleared the cache.
+  Object* result;
+  { HandleScope scope;
+    Handle<CompilationCacheTable> table = GetTable(entry);
+    result = table->LookupEval(*source, *context);
+  }
+  if (result->IsJSFunction()) {
+    return Handle<JSFunction>(JSFunction::cast(result));
+  } else {
+    return Handle<JSFunction>::null();
+  }
+}
+
+
 Handle<JSFunction> CompilationCache::LookupScript(Handle<String> source,
                                                   Handle<Object> name,
                                                   int line_offset,
                                                   int column_offset) {
   Handle<JSFunction> result = Lookup(source, SCRIPT);
   if (result.is_null()) {
     Counters::compilation_cache_misses.Increment();
   } else if (HasOrigin(result, name, line_offset, column_offset)) {
     Counters::compilation_cache_hits.Increment();
   } else {
     result = Handle<JSFunction>::null();
     Counters::compilation_cache_misses.Increment();
   }
   return result;
 }
 
 
 Handle<JSFunction> CompilationCache::LookupEval(Handle<String> source,
+                                                Handle<Context> context,
                                                 Entry entry) {
   ASSERT(entry == EVAL_GLOBAL || entry == EVAL_CONTEXTUAL);
-  Handle<JSFunction> result = Lookup(source, entry);
+  Handle<JSFunction> result = Lookup(source, context, entry);
   if (result.is_null()) {
     Counters::compilation_cache_misses.Increment();
   } else {
     Counters::compilation_cache_hits.Increment();
   }
   return result;
 }
 
 
 void CompilationCache::PutFunction(Handle<String> source,
                                    Entry entry,
                                    Handle<JSFunction> boilerplate) {
   HandleScope scope;
   ASSERT(boilerplate->IsBoilerplate());
   Handle<CompilationCacheTable> table = GetTable(entry);
   CALL_HEAP_FUNCTION_VOID(table->Put(*source, *boilerplate));
 }
 
 
+void CompilationCache::PutEvalFunction(Handle<String> source,
+                                       Handle<Context> context,
+                                       Entry entry,
+                                       Handle<JSFunction> boilerplate) {
+  HandleScope scope;
+  ASSERT(boilerplate->IsBoilerplate());
+  Handle<CompilationCacheTable> table = GetTable(entry);
+  CALL_HEAP_FUNCTION_VOID(table->PutEval(*source, *context, *boilerplate));
+}
+
+
 Handle<FixedArray> CompilationCache::LookupRegExp(Handle<String> source,
                                                   JSRegExp::Flags flags) {
   Handle<CompilationCacheTable> table = GetTable(REGEXP);
   Object* result = table->LookupRegExp(*source, flags);
   if (result->IsFixedArray()) {
     Counters::regexp_cache_hits.Increment();
     return Handle<FixedArray>(FixedArray::cast(result));
   } else {
     Counters::regexp_cache_misses.Increment();
     return Handle<FixedArray>();
@@ skipping 16 matching lines @@
   }
 }
 
 
 void CompilationCache::Iterate(ObjectVisitor* v) {
   v->VisitPointers(&tables[0], &tables[NUMBER_OF_ENTRY_KINDS]);
 }
 
 
 } }  // namespace v8::internal