| Index: runtime/vm/code_patcher_ia32.cc
|
| diff --git a/runtime/vm/code_patcher_ia32.cc b/runtime/vm/code_patcher_ia32.cc
|
| index de3f74c493d55ecd4132d462bbbf3717fbc6d9dd..45f39238fc6e0c6cc5e353765ee5040704c4300e 100644
|
| --- a/runtime/vm/code_patcher_ia32.cc
|
| +++ b/runtime/vm/code_patcher_ia32.cc
|
| @@ -44,13 +44,9 @@ class UnoptimizedCall : public ValueObject {
|
| (code_bytes[2 * kMovInstructionSize] == 0xFF);
|
| }
|
|
|
| - uword return_address() const {
|
| - return start_ + kPatternSize;
|
| - }
|
| + uword return_address() const { return start_ + kPatternSize; }
|
|
|
| - uword call_address() const {
|
| - return start_ + 2 * kMovInstructionSize;
|
| - }
|
| + uword call_address() const { return start_ + 2 * kMovInstructionSize; }
|
|
|
| protected:
|
| uword start_;
|
| @@ -62,8 +58,7 @@ class UnoptimizedCall : public ValueObject {
|
|
|
| class NativeCall : public UnoptimizedCall {
|
| public:
|
| - explicit NativeCall(uword return_address) : UnoptimizedCall(return_address) {
|
| - }
|
| + explicit NativeCall(uword return_address) : UnoptimizedCall(return_address) {}
|
|
|
| NativeFunction native_function() const {
|
| return *reinterpret_cast<NativeFunction*>(start_ + 1);
|
| @@ -145,12 +140,10 @@ class StaticCall : public ValueObject {
|
|
|
| private:
|
| uword return_address() const {
|
| - return start_ + kMovInstructionSize + kCallInstructionSize;
|
| + return start_ + kMovInstructionSize + kCallInstructionSize;
|
| }
|
|
|
| - uword call_address() const {
|
| - return start_ + kMovInstructionSize;
|
| - }
|
| + uword call_address() const { return start_ + kMovInstructionSize; }
|
|
|
| uword start_;
|
|
|
| @@ -182,8 +175,9 @@ void CodePatcher::InsertDeoptimizationCallAt(uword start) {
|
| }
|
|
|
|
|
| -RawCode* CodePatcher::GetInstanceCallAt(
|
| - uword return_address, const Code& code, ICData* ic_data) {
|
| +RawCode* CodePatcher::GetInstanceCallAt(uword return_address,
|
| + const Code& code,
|
| + ICData* ic_data) {
|
| ASSERT(code.ContainsInstructionAt(return_address));
|
| InstanceCall call(return_address);
|
| if (ic_data != NULL) {
|
| @@ -193,8 +187,9 @@ RawCode* CodePatcher::GetInstanceCallAt(
|
| }
|
|
|
|
|
| -RawFunction* CodePatcher::GetUnoptimizedStaticCallAt(
|
| - uword return_address, const Code& code, ICData* ic_data_result) {
|
| +RawFunction* CodePatcher::GetUnoptimizedStaticCallAt(uword return_address,
|
| + const Code& code,
|
| + ICData* ic_data_result) {
|
| ASSERT(code.ContainsInstructionAt(return_address));
|
| UnoptimizedStaticCall static_call(return_address);
|
| ICData& ic_data = ICData::Handle();
|
| @@ -247,7 +242,6 @@ RawCode* CodePatcher::GetNativeCallAt(uword return_address,
|
| }
|
|
|
|
|
| -
|
| intptr_t CodePatcher::InstanceCallSizeInBytes() {
|
| return InstanceCall::kPatternSize;
|
| }
|
|
|