Better tracing of deoptimization (added a reason id and printing of source). Fix a bug with exces...

runtime/vm/code_generator.h

 // Copyright (c) 2011, 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_CODE_GENERATOR_H_
 #define VM_CODE_GENERATOR_H_
 
 #include "vm/globals.h"
 #include "vm/runtime_entry.h"
 
@@ skipping 30 matching lines @@
 DECLARE_RUNTIME_ENTRY(ReportObjectNotClosure);
 DECLARE_RUNTIME_ENTRY(ResolveCompileInstanceFunction);
 DECLARE_RUNTIME_ENTRY(ResolveImplicitClosureFunction);
 DECLARE_RUNTIME_ENTRY(ResolveImplicitClosureThroughGetter);
 DECLARE_RUNTIME_ENTRY(ReThrow);
 DECLARE_RUNTIME_ENTRY(StackOverflow);
 DECLARE_RUNTIME_ENTRY(Throw);
 DECLARE_RUNTIME_ENTRY(TraceFunctionEntry);
 DECLARE_RUNTIME_ENTRY(TraceFunctionExit);
 
+enum DeoptReasonId {
+  kDeoptUnknown,
+  kDeoptIncrLocal,
+  kDeoptIncrInstance,
+  kDeoptIncrInstanceOneClass,
+  kDeoptInstanceGetterSameTarget,
+  kDeoptInstanceGetter,
+  kDeoptStoreIndexed,
+  kDeoptCheckedInstanceCallSmiOnly,
+  kDeoptCheckedInstanceCallSmiFail,
+  kDeoptCheckedInstanceCallCheckFail,
+  kDeoptIntegerToDouble,
+  kDeoptDoubleToDouble,
+  kDeoptSmiBinaryOp,
+  kDeoptMintBinaryOp,
+  kDeoptDoubleBinaryOp,
+  kDeoptInstanceSetterSameTarget,
+  kDeoptInstanceSetter,
+  kDeoptSmiEquality,
+  kDeoptSmiCompareSmis,
+  kDeoptSmiCompareAny,
+  kDeoptEqualityNoFeedback,
+  kDeoptEqualityClassCheck,
+  kDeoptDoubleComparison,
+  kDeoptLoadIndexedFixedArray,
+  kDeoptLoadIndexedGrowableArray,
+};
 
 // This class wraps around the array RawClass::functions_cache_.
 // The structure of that array is specified by FunctionsCache::Entries.
 // The last entry in the array is always NULL, the lookup code can rely on
 // last entry being NULL to terminate its search.
 // The compiled functions are added sequentially (except for the last entry
 // being empty). Names of functions with variable number of arguments
 // can appear several times, once for each valid argument count.
 class FunctionsCache : public ValueObject {
  public:
@@ skipping 24 matching lines @@
                               const Function& function,
                               int num_arguments,
                               int num_named_arguments);
 
   const Class& class_;
 };
 
 }  // namespace dart
 
 #endif  // VM_CODE_GENERATOR_H_