| Index: runtime/vm/instructions_dbc.cc
|
| diff --git a/runtime/vm/instructions_dbc.cc b/runtime/vm/instructions_dbc.cc
|
| index b3f50ad49e20e7877e7491ba759414a649b6bd59..7667a5f2b6b56f2bc0e92ca08f05303c21be9cc8 100644
|
| --- a/runtime/vm/instructions_dbc.cc
|
| +++ b/runtime/vm/instructions_dbc.cc
|
| @@ -38,8 +38,9 @@ static bool HasLoadFromPool(Instr instr) {
|
| }
|
|
|
|
|
| -static bool GetLoadedObjectAt(
|
| - uword pc, const ObjectPool& object_pool, Object* obj) {
|
| +static bool GetLoadedObjectAt(uword pc,
|
| + const ObjectPool& object_pool,
|
| + Object* obj) {
|
| Instr instr = Bytecode::At(pc);
|
| if (HasLoadFromPool(instr)) {
|
| uint16_t index = Bytecode::DecodeD(instr);
|
| @@ -96,7 +97,7 @@ NativeFunction NativeCallPattern::native_function() const {
|
|
|
| void NativeCallPattern::set_native_function(NativeFunction func) const {
|
| object_pool_.SetRawValueAt(native_function_pool_index_,
|
| - reinterpret_cast<uword>(func));
|
| + reinterpret_cast<uword>(func));
|
| }
|
|
|
|
|
| @@ -140,9 +141,7 @@ uword InstructionPattern::DecodeLoadWordFromPool(uword end,
|
| }
|
|
|
|
|
| -bool DecodeLoadObjectFromPoolOrThread(uword pc,
|
| - const Code& code,
|
| - Object* obj) {
|
| +bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) {
|
| ASSERT(code.ContainsInstructionAt(pc));
|
| const ObjectPool& pool = ObjectPool::Handle(code.object_pool());
|
| return GetLoadedObjectAt(pc, pool, obj);
|
| @@ -170,8 +169,9 @@ void CallPattern::SetTargetCode(const Code& target_code) const {
|
|
|
|
|
| void CallPattern::InsertDeoptCallAt(uword pc) {
|
| - const uint8_t argc = Bytecode::IsCallOpcode(Bytecode::At(pc)) ?
|
| - Bytecode::DecodeArgc(Bytecode::At(pc)) : 0;
|
| + const uint8_t argc = Bytecode::IsCallOpcode(Bytecode::At(pc))
|
| + ? Bytecode::DecodeArgc(Bytecode::At(pc))
|
| + : 0;
|
| *reinterpret_cast<Instr*>(pc) = Bytecode::Encode(Bytecode::kDeopt, argc, 0);
|
| }
|
|
|
| @@ -190,8 +190,7 @@ RawObject* SwitchableCallPattern::data() const {
|
|
|
|
|
| RawCode* SwitchableCallPattern::target() const {
|
| - return reinterpret_cast<RawCode*>(
|
| - object_pool_.ObjectAt(target_pool_index_));
|
| + return reinterpret_cast<RawCode*>(object_pool_.ObjectAt(target_pool_index_));
|
| }
|
|
|
|
|
|
|