Remove per-isolate compile-time constants cache.

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 12127 matching lines @@
   }
   return current_class().IsGeneric();
 }
 
 
 void Parser::InsertCachedConstantValue(const Script& script,
                                        TokenPosition token_pos,
                                        const Instance& value) {
   ASSERT(Thread::Current()->IsMutatorThread());
   const intptr_t kInitialConstMapSize = 16;
-  if (script.InVMHeap()) {
-    // For scripts in the vm heap, their constants are in a shared
-    // per-isolate map.
-    Isolate* isolate = Isolate::Current();
-    const String& url = String::Handle(script.url());
-    UrlAndPosKey key(url, token_pos);
-    if (isolate->object_store()->vm_compile_time_constants() == Array::null()) {
-      isolate->object_store()->set_vm_compile_time_constants(
-          Array::Handle(HashTables::New<VMConstantsMap>(
-              kInitialConstMapSize, Heap::kNew)));
-    }
-    VMConstantsMap constants(
-        isolate->object_store()->vm_compile_time_constants());
-    constants.InsertNewOrGetValue(key, value);
-    isolate->object_store()->set_vm_compile_time_constants(constants.Release());
-  } else {
-    // For scripts which are not in the vm heap, their constants are
-    // stored in the script itself.
-    if (script.compile_time_constants() == Array::null()) {
-      const Array& array =
-          Array::Handle(HashTables::New<ConstantsMap>(kInitialConstMapSize,
-                                                      Heap::kNew));
-      script.set_compile_time_constants(array);
-    }
-    ConstantsMap constants(script.compile_time_constants());
-    constants.InsertNewOrGetValue(token_pos, value);
-    script.set_compile_time_constants(constants.Release());
+  ASSERT(!script.InVMHeap());
+  if (script.compile_time_constants() == Array::null()) {
+    const Array& array =
+        Array::Handle(HashTables::New<ConstantsMap>(kInitialConstMapSize,
+                                                    Heap::kNew));
+    script.set_compile_time_constants(array);
   }
+  ConstantsMap constants(script.compile_time_constants());
+  constants.InsertNewOrGetValue(token_pos, value);
+  script.set_compile_time_constants(constants.Release());
 }
 
 
 void Parser::CacheConstantValue(TokenPosition token_pos,
                                 const Instance& value) {
   if (current_function().kind() == RawFunction::kImplicitStaticFinalGetter) {
     // Don't cache constants in initializer expressions. They get
     // evaluated only once.
     return;
   }
   InsertCachedConstantValue(script_, token_pos, value);
 }
 
 
 bool Parser::GetCachedConstant(TokenPosition token_pos, Instance* value) {
   bool is_present = false;
-  if (script_.InVMHeap()) {
-    // For scripts in the vm heap, their constants are in a shared
-    // per-isolate map.
-    if (isolate()->object_store()->vm_compile_time_constants() ==
-        Array::null()) {
-      return false;
-    }
-    UrlAndPosKey key(String::Handle(Z, script_.url()), token_pos);
-    VMConstantsMap constants(
-        isolate()->object_store()->vm_compile_time_constants());
-    *value ^= constants.GetOrNull(key, &is_present);
-    // Mutator compiler thread may add constants while background compiler
-    // is running, and thus change the value of 'vm_compile_time_constants';
-    // do not assert that 'vm_compile_time_constants' has not changed.
-    constants.Release();
-  } else {
-    // For scripts which are not in the vm heap, their constants are
-    // stored in the script itself.
-    if (script_.compile_time_constants() == Array::null()) {
-      return false;
-    }
-    ConstantsMap constants(script_.compile_time_constants());
-    *value ^= constants.GetOrNull(token_pos, &is_present);
-    // Mutator compiler thread may add constants while background compiler
-    // is running, and thus change the value of 'compile_time_constants';
-    // do not assert that 'compile_time_constants' has not changed.
-    constants.Release();
+  ASSERT(!script_.InVMHeap());
+  if (script_.compile_time_constants() == Array::null()) {
+    return false;
   }
+  ConstantsMap constants(script_.compile_time_constants());
+  *value ^= constants.GetOrNull(token_pos, &is_present);
+  // Mutator compiler thread may add constants while background compiler
+  // is running, and thus change the value of 'compile_time_constants';
+  // do not assert that 'compile_time_constants' has not changed.
+  constants.Release();
   if (FLAG_compiler_stats && is_present) {
     thread_->compiler_stats()->num_const_cache_hits++;
   }
   return is_present;
 }
 
 
 RawInstance* Parser::TryCanonicalize(const Instance& instance,
                                      TokenPosition token_pos) {
   if (instance.IsNull()) {
@@ skipping 2446 matching lines @@
     const ArgumentListNode& function_args,
     const LocalVariable* temp_for_last_arg,
     bool is_super_invocation) {
   UNREACHABLE();
   return NULL;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME