Re-landing of "replace TrySync with Metadata".

runtime/vm/clustered_snapshot.cc

 // 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.
 
 #include "vm/clustered_snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 1548 matching lines @@
   virtual ~CodeSerializationCluster() {}
 
   void Trace(Serializer* s, RawObject* object) {
     RawCode* code = Code::RawCast(object);
     objects_.Add(code);
 
     s->Push(code->ptr()->object_pool_);
     s->Push(code->ptr()->owner_);
     s->Push(code->ptr()->exception_handlers_);
     s->Push(code->ptr()->pc_descriptors_);
+#if defined(DART_PRECOMPILED_RUNTIME) || defined(DART_PRECOMPILER)
+    s->Push(code->ptr()->catch_entry_.catch_entry_state_maps_);
+#else
+    s->Push(code->ptr()->catch_entry_.variables_);
+#endif
     s->Push(code->ptr()->stackmaps_);
     s->Push(code->ptr()->inlined_id_to_function_);
     s->Push(code->ptr()->code_source_map_);
 
     if (s->kind() == Snapshot::kAppJIT) {
       s->Push(code->ptr()->deopt_info_array_);
       s->Push(code->ptr()->static_calls_target_table_);
       NOT_IN_PRODUCT(s->Push(code->ptr()->return_address_metadata_));
     }
   }
@@ skipping 34 matching lines @@
           instr = code->ptr()->active_instructions_;
           text_offset = s->GetTextOffset(instr, code);
         }
         s->Write<int32_t>(text_offset);
       }
 
       s->WriteRef(code->ptr()->object_pool_);
       s->WriteRef(code->ptr()->owner_);
       s->WriteRef(code->ptr()->exception_handlers_);
       s->WriteRef(code->ptr()->pc_descriptors_);
+#if defined(DART_PRECOMPILED_RUNTIME) || defined(DART_PRECOMPILER)
+      s->WriteRef(code->ptr()->catch_entry_.catch_entry_state_maps_);
+#else
+      s->WriteRef(code->ptr()->catch_entry_.variables_);
+#endif
       s->WriteRef(code->ptr()->stackmaps_);
       s->WriteRef(code->ptr()->inlined_id_to_function_);
       s->WriteRef(code->ptr()->code_source_map_);
 
       if (s->kind() == Snapshot::kAppJIT) {
         s->WriteRef(code->ptr()->deopt_info_array_);
         s->WriteRef(code->ptr()->static_calls_target_table_);
         NOT_IN_PRODUCT(s->WriteRef(code->ptr()->return_address_metadata_));
       }
 
@@ skipping 50 matching lines @@
       }
 #endif  // !DART_PRECOMPILED_RUNTIME
 
       code->ptr()->object_pool_ =
           reinterpret_cast<RawObjectPool*>(d->ReadRef());
       code->ptr()->owner_ = d->ReadRef();
       code->ptr()->exception_handlers_ =
           reinterpret_cast<RawExceptionHandlers*>(d->ReadRef());
       code->ptr()->pc_descriptors_ =
           reinterpret_cast<RawPcDescriptors*>(d->ReadRef());
+#if defined(DART_PRECOMPILED_RUNTIME) || defined(DART_PRECOMPILER)
+      code->ptr()->catch_entry_.catch_entry_state_maps_ =
+          reinterpret_cast<RawTypedData*>(d->ReadRef());
+#else
+      code->ptr()->catch_entry_.variables_ =
+          reinterpret_cast<RawSmi*>(d->ReadRef());
+#endif
       code->ptr()->stackmaps_ = reinterpret_cast<RawArray*>(d->ReadRef());
       code->ptr()->inlined_id_to_function_ =
           reinterpret_cast<RawArray*>(d->ReadRef());
       code->ptr()->code_source_map_ =
           reinterpret_cast<RawCodeSourceMap*>(d->ReadRef());
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
       if (d->kind() == Snapshot::kAppJIT) {
         code->ptr()->deopt_info_array_ =
             reinterpret_cast<RawArray*>(d->ReadRef());
@@ skipping 3811 matching lines @@
     thread_->isolate()->SetupImagePage(data_buffer_,
                                        /* is_executable */ false);
   }
 
   deserializer.ReadIsolateSnapshot(thread_->isolate()->object_store());
 
   return ApiError::null();
 }
 
 }  // namespace dart