Revert "VM: New calling convention for generated code."

runtime/vm/raw_object_snapshot.cc

 // Copyright (c) 2012, 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/native_entry.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 683 matching lines @@
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFunctionCid);
   writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the boolean is_in_fullsnapshot first as this will
   // help the reader decide how the rest of the information needs
   // to be interpreted.
   writer->Write<bool>(is_in_fullsnapshot);
 
   if (kind == Snapshot::kFull || !is_in_fullsnapshot) {
-    bool is_optimized = Code::IsOptimized(ptr()->code_);
+    bool is_optimized = Code::IsOptimized(ptr()->instructions_->ptr()->code_);
 
     // Write out all the non object fields.
     writer->Write<int32_t>(ptr()->token_pos_);
     writer->Write<int32_t>(ptr()->end_token_pos_);
     if (is_optimized) {
       writer->Write<int32_t>(FLAG_optimization_counter_threshold);
     } else {
       writer->Write<int32_t>(0);
     }
     writer->Write<int16_t>(ptr()->num_fixed_parameters_);
@@ skipping 469 matching lines @@
                         intptr_t tags,
                         Snapshot::Kind kind) {
   ASSERT(reader->snapshot_code());
   ASSERT(kind == Snapshot::kFull);
 
   Code& result = Code::ZoneHandle(reader->zone(), NEW_OBJECT_WITH_LEN(Code, 0));
   reader->AddBackRef(object_id, &result, kIsDeserialized);
 
   result.set_compile_timestamp(reader->Read<int64_t>());
   result.set_state_bits(reader->Read<int32_t>());
+  result.set_entry_patch_pc_offset(reader->Read<int32_t>());
+  result.set_patch_code_pc_offset(reader->Read<int32_t>());
   result.set_lazy_deopt_pc_offset(reader->Read<int32_t>());
 
   // Set all the object fields.
   READ_OBJECT_FIELDS(result,
                      result.raw()->from(), result.raw()->to(),
                      kAsReference);
 
   // TODO(rmacnak): Fix entry_point_.
 
   return result.raw();
@@ skipping 16 matching lines @@
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kCodeCid);
   writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->Write<int64_t>(ptr()->compile_timestamp_);
   writer->Write<int32_t>(ptr()->state_bits_);
+  writer->Write<int32_t>(ptr()->entry_patch_pc_offset_);
+  writer->Write<int32_t>(ptr()->patch_code_pc_offset_);
   writer->Write<int32_t>(ptr()->lazy_deopt_pc_offset_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 
   writer->SetInstructionsCode(ptr()->instructions_, this);
 }
 
 
@@ skipping 36 matching lines @@
 
   writer->Write<intptr_t>(writer->GetObjectTags(this));  // For sanity check.
 
   // Temporarily restore the object header for writing to the text section.
   // TODO(asiva): Don't mutate object headers during serialization.
   uword object_tags = writer->GetObjectTags(this);
   uword snapshot_tags = ptr()->tags_;
   ptr()->tags_ = object_tags;
   writer->Write<int32_t>(writer->GetInstructionsId(this));
   ptr()->tags_ = snapshot_tags;
+
+  {
+    // TODO(rmacnak): Drop after calling convention change.
+    writer->WriteObjectImpl(ptr()->code_, kAsReference);
+    writer->WriteObjectImpl(ptr()->object_pool_, kAsReference);
+  }
 }
 
 
 RawObjectPool* ObjectPool::ReadFrom(SnapshotReader* reader,
                                     intptr_t object_id,
                                     intptr_t tags,
                                     Snapshot::Kind kind) {
   ASSERT(reader->snapshot_code());
   ASSERT(kind == Snapshot::kFull);
 
@@ skipping 1995 matching lines @@
     // We do not allow objects with native fields in an isolate message.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a UserTag)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart