Re-landing of "replace TrySync with Metadata".

runtime/vm/clustered_snapshot.cc

Index: runtime/vm/clustered_snapshot.cc
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
index dc9e0fe45065aae6c6ec7bcc52642f7f52aa3394..19d2e14621a08d49f8ee8b946946b58f5c0daa99 100644
--- a/runtime/vm/clustered_snapshot.cc
+++ b/runtime/vm/clustered_snapshot.cc
@@ -1566,6 +1566,11 @@ class CodeSerializationCluster : public SerializationCluster {
     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_);
@@ -1620,6 +1625,11 @@ class CodeSerializationCluster : public SerializationCluster {
       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_);
@@ -1690,6 +1700,13 @@ class CodeDeserializationCluster : public DeserializationCluster {
           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());