Put back compilation cache

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 79 matching lines @@
     result = table->LookupRegExp(*source, flags);
   }
   if (result->IsFixedArray()) {
     return Handle<FixedArray>(FixedArray::cast(result));
   } else {
     return Handle<FixedArray>::null();
   }
 }
 
 
+// We only re-use a cached function for some script source code if the
+// script originates from the same places. This is to avoid issues

[iposva, 2009/04/02 18:24:16]

places -> place?

[DaveMoore, 2009/04/06 18:08:23]

Done.

+// when reporting errors, etc.
+// We only re-use a cached function for some script source code if the
+// script originates from the same places. This is to avoid issues
+// when reporting errors, etc.

[iposva, 2009/04/02 18:24:16]

Duplicated comment.

[DaveMoore, 2009/04/06 18:08:23]

Done.

+static bool HasOrigin(Handle<JSFunction> boilerplate,
+                      Handle<Object> name,
+                      int line_offset,
+                      int column_offset) {
+  Handle<Script> script =
+      Handle<Script>(Script::cast(boilerplate->shared()->script()));
+  // If the script name isn't set, the boilerplate script should have
+  // an undefined name to have the same origin.
+  if (name.is_null()) {
+    return script->name()->IsUndefined();
+  }
+  // Do the fast bailout checks first.
+  if (line_offset != script->line_offset()->value()) return false;
+  if (column_offset != script->column_offset()->value()) return false;
+  // Check that both names are strings. If not, no match.
+  if (!name->IsString() || !script->name()->IsString()) return false;
+  // Compare the two name strings for equality.
+  return String::cast(*name)->Equals(String::cast(script->name()));
+}
+
+
+static Handle<JSFunction> Lookup(Handle<String> source,
+                                 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->Lookup(*source);
+  }
+  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) {

[iposva, 2009/04/02 18:24:16]

Please refer to the bug 254 in a TODO here.

[DaveMoore, 2009/04/06 18:08:23]

Done, but the details are slightly different. We won't share code accidentally
across contexts, but if a second identical script is compiled (from a different
source / line) it won't use the cached copy and won't be cached itself.

[iposva, 2009/04/06 18:11:20]

I must be missing how you protect against sharing code in two contexts.

-  // TODO(245): Start caching scripts again but make it local to a
-  // global context to avoid sharing code between independent
-  // environments.
-  return Handle<JSFunction>::null();
+  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, context, entry);
   if (result.is_null()) {
     Counters::compilation_cache_misses.Increment();
@@ skipping 10 matching lines @@
   if (result.is_null()) {
     Counters::compilation_cache_misses.Increment();
   } else {
     Counters::compilation_cache_hits.Increment();
   }
   return result;
 }
 
 
 void CompilationCache::PutScript(Handle<String> source,
-                                 Entry entry,
                                  Handle<JSFunction> boilerplate) {
-  // TODO(245): Start caching scripts again but make it local to a
-  // global context to avoid sharing code between independent
-  // environments.
+  HandleScope scope;
+  ASSERT(boilerplate->IsBoilerplate());
+  Handle<CompilationCacheTable> table = GetTable(SCRIPT);
+  CALL_HEAP_FUNCTION_VOID(table->Put(*source, *boilerplate));
 }
 
 
 void CompilationCache::PutEval(Handle<String> source,
                                Handle<Context> context,
                                Entry entry,
                                Handle<JSFunction> boilerplate) {
   HandleScope scope;
   ASSERT(boilerplate->IsBoilerplate());
   Handle<CompilationCacheTable> table = GetTable(entry);
@@ skipping 17 matching lines @@
   }
 }
 
 
 void CompilationCache::Iterate(ObjectVisitor* v) {
   v->VisitPointers(&tables[0], &tables[NUMBER_OF_ENTRY_KINDS]);
 }
 
 
 } }  // namespace v8::internal