Index: test/cctest/test-disasm-ia32.cc |
diff --git a/test/cctest/test-disasm-ia32.cc b/test/cctest/test-disasm-ia32.cc |
index 49e67388b731edbc60fe200f89cbde4d82fc5612..8240a9546d22b2eff4ddd392004bbb541d81034b 100644 |
--- a/test/cctest/test-disasm-ia32.cc |
+++ b/test/cctest/test-disasm-ia32.cc |
@@ -56,9 +56,10 @@ static void DummyStaticFunction(Object* result) { |
TEST(DisasmIa320) { |
InitializeVM(); |
- v8::HandleScope scope; |
+ Isolate* isolate = reinterpret_cast<Isolate*>(env->GetIsolate()); |
+ HandleScope scope(isolate); |
v8::internal::byte buffer[2048]; |
- Assembler assm(Isolate::Current(), buffer, sizeof buffer); |
+ Assembler assm(isolate, buffer, sizeof buffer); |
DummyStaticFunction(NULL); // just bloody use it (DELETE; debugging) |
// Short immediate instructions |
@@ -270,8 +271,7 @@ TEST(DisasmIa320) { |
__ bind(&L2); |
__ call(Operand(ebx, ecx, times_4, 10000)); |
__ nop(); |
- Handle<Code> ic(Isolate::Current()->builtins()->builtin( |
- Builtins::kLoadIC_Initialize)); |
+ Handle<Code> ic(isolate->builtins()->builtin(Builtins::kLoadIC_Initialize)); |
__ call(ic, RelocInfo::CODE_TARGET); |
__ nop(); |
__ call(FUNCTION_ADDR(DummyStaticFunction), RelocInfo::RUNTIME_ENTRY); |
@@ -281,8 +281,7 @@ TEST(DisasmIa320) { |
__ jmp(Operand(ebx, ecx, times_4, 10000)); |
#ifdef ENABLE_DEBUGGER_SUPPORT |
ExternalReference after_break_target = |
- ExternalReference(Debug_Address::AfterBreakTarget(), |
- assm.isolate()); |
+ ExternalReference(Debug_Address::AfterBreakTarget(), isolate); |
__ jmp(Operand::StaticVariable(after_break_target)); |
#endif // ENABLE_DEBUGGER_SUPPORT |
__ jmp(ic, RelocInfo::CODE_TARGET); |
@@ -459,7 +458,6 @@ TEST(DisasmIa320) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Isolate* isolate = Isolate::Current(); |
Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |