This adds a mechanism to invalidate code that was generated in the background. The invalidation can…

runtime/vm/isolate.h

 // Copyright (c) 2013, 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.
 
 #ifndef VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
@@ skipping 596 matching lines @@
   void set_current_tag(const UserTag& tag);
 
   RawUserTag* default_tag() const { return default_tag_; }
   void set_default_tag(const UserTag& tag);
 
   RawGrowableObjectArray* compilation_function_queue() const {
     return compilation_function_queue_;
   }
   void set_compilation_function_queue(const GrowableObjectArray& value);
 
-  RawGrowableObjectArray* compilation_code_queue() const {
-    return compilation_code_queue_;
+  RawGrowableObjectArray* compilation_result_queue() const {
+    return compilation_result_queue_;
   }
-  void set_compilation_code_queue(const GrowableObjectArray& value);
+  void set_compilation_result_queue(const GrowableObjectArray& value);
 
   Metric* metrics_list_head() {
     return metrics_list_head_;
   }
 
   void set_metrics_list_head(Metric* metric) {
     metrics_list_head_ = metric;
   }
 
   RawGrowableObjectArray* deoptimized_code_array() const {
     return deoptimized_code_array_;
   }
   void set_deoptimized_code_array(const GrowableObjectArray& value);
   void TrackDeoptimizedCode(const Code& code);
 
   bool compilation_allowed() const { return compilation_allowed_; }
   void set_compilation_allowed(bool allowed) {
     compilation_allowed_ = allowed;
   }
 
   // In precompilation we finalize all regular classes before compiling.
   bool all_classes_finalized() const { return all_classes_finalized_; }
   void set_all_classes_finalized(bool value) {
     all_classes_finalized_ = value;
   }
 
+  void IncrCHAInvalidationGen() { cha_invalidation_gen_++; }
+  void ResetCHAInvalidationGen() { cha_invalidation_gen_ = 0; }
+  uint32_t cha_invalidation_gen() const { return cha_invalidation_gen_; }
+
+  void IncrFieldInvalidationGen() { field_invalidation_gen_++; }
+  void ResetFieldInvalidationGen() { field_invalidation_gen_ = 0; }
+  uint32_t field_invalidation_gen() const { return field_invalidation_gen_; }
+
+  void IncrPrefixInvalidationGen() { prefix_invalidation_gen_++; }
+  void ResetPrefixInvalidationGen() { prefix_invalidation_gen_ = 0; }
+  uint32_t prefix_invalidation_gen() const { return prefix_invalidation_gen_; }
+
   RawObject* InvokePendingServiceExtensionCalls();
   void AppendServiceExtensionCall(const Instance& closure,
                            const String& method_name,
                            const Array& parameter_keys,
                            const Array& parameter_values,
                            const Instance& reply_port,
                            const Instance& id);
   void RegisterServiceExtensionHandler(const String& name,
                                        const Instance& closure);
   RawInstance* LookupServiceExtensionHandler(const String& name);
@@ skipping 141 matching lines @@
   Mutex profiler_data_mutex_;
 
   VMTagCounters vm_tag_counters_;
   RawGrowableObjectArray* tag_table_;
 
   RawGrowableObjectArray* deoptimized_code_array_;
 
   // Background compilation.
   BackgroundCompiler* background_compiler_;
   RawGrowableObjectArray* compilation_function_queue_;
-  RawGrowableObjectArray* compilation_code_queue_;
+  RawGrowableObjectArray* compilation_result_queue_;
 
   // We use 6 list entries for each pending service extension calls.
   enum {
     kPendingHandlerIndex = 0,
     kPendingMethodNameIndex,
     kPendingKeysIndex,
     kPendingValuesIndex,
     kPendingReplyPortIndex,
     kPendingIdIndex,
     kPendingEntrySize
@@ skipping 12 matching lines @@
 
   bool compilation_allowed_;
   bool all_classes_finalized_;
 
   // Isolate list next pointer.
   Isolate* next_;
 
   // Used to wake the isolate when it is in the pause event loop.
   Monitor* pause_loop_monitor_;
 
+  // Invalidation generations; used to track events occuring in parallel
+  // to background compilation. The counters may overflow, which is OK
+  // since we check for equality to detect if an event occured.
+  uint32_t cha_invalidation_gen_;
+  uint32_t field_invalidation_gen_;
+  uint32_t prefix_invalidation_gen_;
+
 #define ISOLATE_METRIC_VARIABLE(type, variable, name, unit)                    \
   type metric_##variable##_;
   ISOLATE_METRIC_LIST(ISOLATE_METRIC_VARIABLE);
 #undef ISOLATE_METRIC_VARIABLE
 
 #define ISOLATE_TIMELINE_STREAM_VARIABLE(name, not_used)                       \
   TimelineStream stream_##name##_;
   ISOLATE_TIMELINE_STREAM_LIST(ISOLATE_TIMELINE_STREAM_VARIABLE)
 #undef ISOLATE_TIMELINE_STREAM_VARIABLE
 
@@ skipping 173 matching lines @@
   uint8_t* serialized_message_;
   intptr_t serialized_message_len_;
   Isolate::Flags isolate_flags_;
   bool paused_;
   bool errors_are_fatal_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_