Index: runtime/vm/assembler_arm.cc |
diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/assembler_arm.cc |
index 31937963c1a157528dbfa695039b231881421506..a354940d55c75da15cb049508cd3adb41a0ee217 100644 |
--- a/runtime/vm/assembler_arm.cc |
+++ b/runtime/vm/assembler_arm.cc |
@@ -1967,8 +1967,10 @@ void Assembler::LoadClassId(Register result, Register object, Condition cond) { |
void Assembler::LoadClassById(Register result, Register class_id) { |
ASSERT(result != class_id); |
- LoadImmediate(result, Isolate::Current()->class_table()->TableAddress()); |
- LoadFromOffset(kWord, result, result, 0); |
+ LoadIsolate(result); |
+ const intptr_t offset = |
+ Isolate::class_table_offset() + ClassTable::table_offset(); |
+ LoadFromOffset(kWord, result, result, offset); |
ldr(result, Address(result, class_id, LSL, 2)); |
} |