VM: Fix race between background compiler and guarded cid update.

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 542 matching lines @@
 
   void IncrTopLevelParsingCount() {
     AtomicOperations::IncrementBy(&top_level_parsing_count_, 1);
   }
   void DecrTopLevelParsingCount() {
     AtomicOperations::DecrementBy(&top_level_parsing_count_, 1);
   }
 
   static const intptr_t kInvalidGen = 0;
 
-  void IncrFieldInvalidationGen() {
-    AtomicOperations::IncrementBy(&field_invalidation_gen_, 1);
-    if (field_invalidation_gen_ == kInvalidGen) {
-      AtomicOperations::IncrementBy(&field_invalidation_gen_, 1);
-    }
-  }
-  intptr_t field_invalidation_gen() const { return field_invalidation_gen_; }
-
   void IncrLoadingInvalidationGen() {
     AtomicOperations::IncrementBy(&loading_invalidation_gen_, 1);
     if (loading_invalidation_gen_ == kInvalidGen) {
       AtomicOperations::IncrementBy(&loading_invalidation_gen_, 1);
     }
   }
   intptr_t loading_invalidation_gen() {
     return AtomicOperations::LoadRelaxedIntPtr(&loading_invalidation_gen_);
   }
 
-  // Used by mutator thread to notify background compiler which fields
-  // triggered code invalidation.
-  void AddDisablingField(const Field& field);
-  // Returns Field::null() if none available in the list. Can be called
-  // only from background compiler and while mutator thread is at safepoint.
-  RawField* GetDisablingField();
-  void ClearDisablingFieldList();
-
   // Used by background compiler which field became boxed and must trigger
   // deoptimization in the mutator thread.
   void AddDeoptimizingBoxedField(const Field& field);
   // Returns Field::null() if none available in the list.
   RawField* GetDeoptimizingBoxedField();
 
   RawObject* InvokePendingServiceExtensionCalls();
   void AppendServiceExtensionCall(const Instance& closure,
                            const String& method_name,
                            const Array& parameter_keys,
@@ skipping 199 matching lines @@
 
   // 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.
-  intptr_t field_invalidation_gen_;
   intptr_t loading_invalidation_gen_;
   intptr_t top_level_parsing_count_;
 
-  // Protect access to boxed_field_list_ and disabling_field_list_.
+  // Protect access to boxed_field_list_.
   Mutex* field_list_mutex_;
   // List of fields that became boxed and that trigger deoptimization.
   RawGrowableObjectArray* boxed_field_list_;
-  // List of fields that were disabling code while background compiler
-  // was running.
-  RawGrowableObjectArray* disabling_field_list_;
 
   // This guards spawn_count_. An isolate cannot complete shutdown and be
   // destroyed while there are child isolates in the midst of a spawn.
   Monitor* spawn_count_monitor_;
   intptr_t spawn_count_;
 
   // Has a reload ever been attempted?
   bool has_attempted_reload_;
   intptr_t no_reload_scope_depth_;  // we can only reload when this is 0.
   IsolateReloadContext* reload_context_;
@@ skipping 160 matching lines @@
   intptr_t* spawn_count_;
 
   Dart_IsolateFlags isolate_flags_;
   bool paused_;
   bool errors_are_fatal_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_