Move deopt_id and related helpers/definitions from Isolate to Thread

runtime/vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
@@ skipping 106 matching lines @@
   FlowGraph* caller_graph_;
   Definition* call_;
   GrowableArray<Data> exits_;
 };
 
 
 // Build a flow graph from a parsed function's AST.
 class FlowGraphBuilder : public ValueObject {
  public:
   // The inlining context is NULL if not inlining.  The osr_id is the deopt
-  // id of the OSR entry or Isolate::kNoDeoptId if not compiling for OSR.
+  // id of the OSR entry or Thread::kNoDeoptId if not compiling for OSR.
   FlowGraphBuilder(const ParsedFunction& parsed_function,
                    const ZoneGrowableArray<const ICData*>& ic_data_array,
                    InlineExitCollector* exit_collector,
                    intptr_t osr_id);
 
   FlowGraph* BuildGraph();
 
   const ParsedFunction& parsed_function() const { return parsed_function_; }
   const Function& function() const { return parsed_function_.function(); }
   const ZoneGrowableArray<const ICData*>& ic_data_array() const {
@@ skipping 65 matching lines @@
 
   NestedStatement* nesting_stack() const { return nesting_stack_; }
 
   // When compiling for OSR, remove blocks that are not reachable from the
   // OSR entry point.
   void PruneUnreachable();
 
   // Returns address where the constant 'value' is stored or 0 if not found.
   static uword FindDoubleConstant(double value);
 
+  Thread* thread() const { return parsed_function().thread(); }
   Isolate* isolate() const { return parsed_function().isolate(); }
   Zone* zone() const { return parsed_function().zone(); }
 
  private:
   friend class NestedStatement;  // Explicit access to nesting_stack_.
   friend class Intrinsifier;
 
   intptr_t parameter_count() const {
     return num_copied_params_ + num_non_copied_params_;
   }
@@ skipping 17 matching lines @@
 
   // The expression stack height.
   intptr_t temp_count_;
 
   // Outgoing argument stack height.
   intptr_t args_pushed_;
 
   // A stack of enclosing nested statements.
   NestedStatement* nesting_stack_;
 
-  // The deopt id of the OSR entry or Isolate::kNoDeoptId if not compiling
+  // The deopt id of the OSR entry or Thread::kNoDeoptId if not compiling
   // for OSR.
   const intptr_t osr_id_;
 
   intptr_t jump_count_;
   ZoneGrowableArray<JoinEntryInstr*>* await_joins_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FlowGraphBuilder);
 };
 
 
@@ skipping 198 matching lines @@
   // Helpers for allocating and deallocating temporary locals on top of the
   // expression stack.
   LocalVariable* EnterTempLocalScope(Value* value);
   Definition* ExitTempLocalScope(LocalVariable* var);
 
   void BuildLetTempExpressions(LetNode* node);
 
   void BuildInstanceGetterConditional(InstanceGetterNode* node);
   void BuildInstanceCallConditional(InstanceCallNode* node);
 
+  Thread* thread() const { return owner()->thread(); }
   Isolate* isolate() const { return owner()->isolate(); }
   Zone* zone() const { return owner()->zone(); }
 
  private:
   friend class TempLocalScope;  // For ReturnDefinition.
 
   // Helper to drop the result value.
   virtual void ReturnValue(Value* value) {
     Do(new DropTempsInstr(0, value));
   }
@@ skipping 121 matching lines @@
   // Output parameters.
   GrowableArray<TargetEntryInstr**> true_successor_addresses_;
   GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_