Reapply "Shuffle around deopt id allocation...

runtime/vm/kernel_to_il.h

 // Copyright (c) 2016, 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 RUNTIME_VM_KERNEL_TO_IL_H_
 #define RUNTIME_VM_KERNEL_TO_IL_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include "vm/growable_array.h"
@@ skipping 1024 matching lines @@
   Value* Pop();
   Fragment Drop();
 
   bool IsInlining() { return exit_collector_ != NULL; }
 
   Token::Kind MethodKind(const dart::String& name);
 
   void InlineBailout(const char* reason);
 
   TranslationHelper translation_helper_;
+  Thread* thread_;
   Zone* zone_;
 
   // The node we are currently compiling (e.g. FunctionNode, Constructor,
   // Field)
   TreeNode* node_;
 
   ParsedFunction* parsed_function_;
   intptr_t osr_id_;
   const ZoneGrowableArray<const ICData*>& ic_data_array_;
   InlineExitCollector* exit_collector_;
 
   intptr_t next_block_id_;
   intptr_t AllocateBlockId() { return next_block_id_++; }
 
+  intptr_t GetNextDeoptId() {
+    // TODO(rmacnak): Record current scope / context level.
+    return thread_->GetNextDeoptId();
+  }
+
   intptr_t next_function_id_;
   intptr_t AllocateFunctionId() { return next_function_id_++; }
 
   intptr_t context_depth_;
   intptr_t loop_depth_;
   intptr_t try_depth_;
   intptr_t catch_depth_;
   intptr_t for_in_depth_;
   Fragment fragment_;
   Value* stack_;
@@ skipping 292 matching lines @@
 namespace kernel {
 
 RawObject* EvaluateMetadata(const dart::Field& metadata_field);
 RawObject* BuildParameterDescriptor(const Function& function);
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_TO_IL_H_