| Index: runtime/vm/instructions_arm64.h
|
| diff --git a/runtime/vm/instructions_arm64.h b/runtime/vm/instructions_arm64.h
|
| index 430be0f169df52a20b1e6bf640b0d2864d13d40d..34bc3326d12dc8f6946fdeeb2948114b05e52a66 100644
|
| --- a/runtime/vm/instructions_arm64.h
|
| +++ b/runtime/vm/instructions_arm64.h
|
| @@ -61,14 +61,14 @@ class CallPattern : public ValueObject {
|
|
|
| RawICData* IcData();
|
|
|
| - uword TargetAddress() const;
|
| - void SetTargetAddress(uword target_address) const;
|
| + RawCode* TargetCode() const;
|
| + void SetTargetCode(const Code& target) const;
|
|
|
| // This constant length is only valid for inserted call patterns used for
|
| // lazy deoptimization. Regular call pattern may vary in length.
|
| - static const int kLengthInBytes = 5 * Instr::kInstrSize;
|
| + static const int kDeoptCallLengthInBytes = 5 * Instr::kInstrSize;
|
|
|
| - static void InsertAt(uword pc, uword target_address);
|
| + static void InsertDeoptCallAt(uword pc, uword target_address);
|
|
|
| private:
|
| const ObjectPool& object_pool_;
|
| @@ -76,7 +76,7 @@ class CallPattern : public ValueObject {
|
| uword end_;
|
| uword ic_data_load_end_;
|
|
|
| - intptr_t target_address_pool_index_;
|
| + intptr_t target_code_pool_index_;
|
| ICData& ic_data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CallPattern);
|
| @@ -87,8 +87,8 @@ class NativeCallPattern : public ValueObject {
|
| public:
|
| NativeCallPattern(uword pc, const Code& code);
|
|
|
| - uword target() const;
|
| - void set_target(uword target_address) const;
|
| + RawCode* target() const;
|
| + void set_target(const Code& target) const;
|
|
|
| NativeFunction native_function() const;
|
| void set_native_function(NativeFunction target) const;
|
| @@ -98,33 +98,12 @@ class NativeCallPattern : public ValueObject {
|
|
|
| uword end_;
|
| intptr_t native_function_pool_index_;
|
| - intptr_t target_address_pool_index_;
|
| + intptr_t target_code_pool_index_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeCallPattern);
|
| };
|
|
|
|
|
| -class JumpPattern : public ValueObject {
|
| - public:
|
| - JumpPattern(uword pc, const Code& code);
|
| -
|
| - static const int kLengthInBytes = 5 * Instr::kInstrSize;
|
| -
|
| - int pattern_length_in_bytes() const {
|
| - return kLengthInBytes;
|
| - }
|
| -
|
| - bool IsValid() const;
|
| - uword TargetAddress() const;
|
| - void SetTargetAddress(uword target_address) const;
|
| -
|
| - private:
|
| - const uword pc_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(JumpPattern);
|
| -};
|
| -
|
| -
|
| class ReturnPattern : public ValueObject {
|
| public:
|
| explicit ReturnPattern(uword pc);
|
|
|