Track prologue offset of Code and use for more precise return addresses

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/globals.h"
@@ skipping 926 matching lines @@
   RawArray* hide_names_;         // blacklist of names that are not exported.
   RawField* metadata_field_;     // remembers the token pos of metadata if any,
                                  // and the metadata values if computed.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->metadata_field_);
   }
 };
 
 
 class RawCode : public RawObject {
+  enum InlinedMetadataIndex {
+    kInlinedIntervalsIndex = 0,
+    kInlinedIdToFunctionIndex = 1,
+    kInlinedMetadataSize = 2,
+  };
+
   RAW_HEAP_OBJECT_IMPLEMENTATION(Code);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->instructions_);
   }
   RawInstructions* instructions_;
   // If owner_ is Function::null() the owner is a regular stub.
   // If owner_ is a Class the owner is the allocation stub for that class.
   // Else, owner_ is a regular Dart Function.
   RawObject* owner_;  // Function, Null, or a Class.
   RawExceptionHandlers* exception_handlers_;
   RawPcDescriptors* pc_descriptors_;
   RawArray* deopt_info_array_;
   RawArray* static_calls_target_table_;  // (code-offset, function, code).
   RawArray* stackmaps_;
   RawLocalVarDescriptors* var_descriptors_;
-  RawArray* inlined_intervals_;
-  RawArray* inlined_id_to_function_;
+  RawArray* inlined_metadata_;
   RawArray* comments_;
+  // If return_address_info_ is a Smi, it is the offset to the prologue.
+  // Else, return_address_info_ is null.
+  RawObject* return_address_metadata_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->comments_);
   }
 
   // Compilation timestamp.
   int64_t compile_timestamp_;
 
   // state_bits_ is a bitfield with three fields:
   // The optimized bit, the alive bit, and a count of the number of pointer
   // offsets.
   // Alive: If true, the embedded object pointers will be visited during GC.
   int32_t state_bits_;
 
   // PC offsets for code patching.
   int32_t entry_patch_pc_offset_;
   int32_t patch_code_pc_offset_;
   int32_t lazy_deopt_pc_offset_;
 
   // Variable length data follows here.
   int32_t* data() { OPEN_ARRAY_START(int32_t, int32_t); }
   const int32_t* data() const { OPEN_ARRAY_START(int32_t, int32_t); }
 
+  friend class Code;
+  friend class Function;
+  friend class MarkingVisitor;
   friend class StackFrame;
-  friend class MarkingVisitor;
-  friend class Function;
 };
 
 
 class RawInstructions : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Instructions);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->code_);
   }
   RawCode* code_;
@@ skipping 1122 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_