Re-landing of "replace TrySync with Metadata".

runtime/vm/exceptions.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 RUNTIME_VM_EXCEPTIONS_H_
 #define RUNTIME_VM_EXCEPTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/token_position.h"
 
@@ skipping 84 matching lines @@
 // The index into the ExceptionHandlers table corresponds to
 // the try_index of the handler.
 struct ExceptionHandlerInfo {
   uint32_t handler_pc_offset;  // PC offset value of handler.
   int16_t outer_try_index;     // Try block index of enclosing try block.
   int8_t needs_stacktrace;     // True if a stacktrace is needed.
   int8_t has_catch_all;        // Catches all exceptions.
   int8_t is_generated;         // True if this is a generated handler.
 };
 
+
+class CatchEntryState {
+ public:
+  enum { kCatchEntryStateIsMove = 1, kCatchEntryStateDestShift = 1 };
+
+  CatchEntryState() : data(NULL), ref_count(NULL) {}
+  explicit CatchEntryState(intptr_t* data_)
+      : data(data_), ref_count(new intptr_t(1)) {}

[Florian Schneider, 2017/03/09 16:33:32]

Style: Private fields end with _. Rename parameter to 'data' and the member to
'data_'

[Dmitry Olshansky, 2017/03/13 12:26:30]

Done.

+
+  CatchEntryState(const CatchEntryState& state) { Copy(state); }
+
+  ~CatchEntryState() { Destroy(); }
+
+  CatchEntryState& operator=(const CatchEntryState& state) {
+    Destroy();
+    Copy(state);
+    return *this;
+  }
+
+  bool Empty() { return ref_count == NULL; }
+
+  intptr_t Pairs() { return data[0]; }
+
+  intptr_t Src(intptr_t i) { return data[1 + 2 * i]; }
+
+  intptr_t Dest(intptr_t i) {
+    return data[2 + 2 * i] >> kCatchEntryStateDestShift;
+  }
+
+  bool isMove(intptr_t i) { return data[2 + 2 * i] & kCatchEntryStateIsMove; }
+
+ private:
+  void Destroy() {
+    if (ref_count != NULL) {
+      (*ref_count)--;
+      if (*ref_count == 0) {
+        delete ref_count;
+        delete[] data;
+      }
+    }
+  }
+
+  void Copy(const CatchEntryState& state) {
+    data = state.data;
+    ref_count = state.ref_count;
+    if (ref_count != NULL) {
+      (*ref_count)++;
+    }
+  }
+
+  // Data has the following format:
+  // 0 - number of pairs in this state
+  // 1-2 - 1st encoded src,dest pair
+  // 3-4 - 2nd pair
+  // ....
+  intptr_t* data;
+  intptr_t* ref_count;

[Florian Schneider, 2017/03/09 16:33:32]

s/ref_count/ref_count_/g

[Dmitry Olshansky, 2017/03/13 12:26:31]

Done.

+};
+
 }  // namespace dart
 
 #endif  // RUNTIME_VM_EXCEPTIONS_H_