Added a version of the v8::HandleScope constructor with an Isolate and use that consistently.

test/cctest/test-assembler-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 39 matching lines @@
   if (env.IsEmpty()) {
     env = v8::Context::New();
   }
 }
 
 
 #define __ assm.
 
 TEST(0) {
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   __ add(r0, r0, Operand(r1));
   __ mov(pc, Operand(lr));
 
   CodeDesc desc;
   assm.GetCode(&desc);
   Object* code = isolate->heap()->CreateCode(
       desc,
       Code::ComputeFlags(Code::STUB),
       Handle<Code>())->ToObjectChecked();
   CHECK(code->IsCode());
 #ifdef DEBUG
   Code::cast(code)->Print();
 #endif
   F2 f = FUNCTION_CAST<F2>(Code::cast(code)->entry());
   int res = reinterpret_cast<int>(CALL_GENERATED_CODE(f, 3, 4, 0, 0, 0));
   ::printf("f() = %d\n", res);
   CHECK_EQ(7, res);
 }
 
 
 TEST(1) {
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
   __ mov(r1, Operand(r0));
   __ mov(r0, Operand::Zero());
   __ b(&C);
 
   __ bind(&L);
   __ add(r0, r0, Operand(r1));
   __ sub(r1, r1, Operand(1));
@@ skipping 15 matching lines @@
 #endif
   F1 f = FUNCTION_CAST<F1>(Code::cast(code)->entry());
   int res = reinterpret_cast<int>(CALL_GENERATED_CODE(f, 100, 0, 0, 0, 0));
   ::printf("f() = %d\n", res);
   CHECK_EQ(5050, res);
 }
 
 
 TEST(2) {
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
   __ mov(r1, Operand(r0));
   __ mov(r0, Operand(1));
   __ b(&C);
 
   __ bind(&L);
   __ mul(r0, r1, r0);
   __ sub(r1, r1, Operand(1));
@@ skipping 24 matching lines @@
 #endif
   F1 f = FUNCTION_CAST<F1>(Code::cast(code)->entry());
   int res = reinterpret_cast<int>(CALL_GENERATED_CODE(f, 10, 0, 0, 0, 0));
   ::printf("f() = %d\n", res);
   CHECK_EQ(3628800, res);
 }
 
 
 TEST(3) {
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     int i;
     char c;
     int16_t s;
   } T;
   T t;
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
   __ mov(ip, Operand(sp));
   __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
   __ sub(fp, ip, Operand(4));
   __ mov(r4, Operand(r0));
   __ ldr(r0, MemOperand(r4, OFFSET_OF(T, i)));
   __ mov(r2, Operand(r0, ASR, 1));
   __ str(r2, MemOperand(r4, OFFSET_OF(T, i)));
@@ skipping 26 matching lines @@
   CHECK_EQ(101010, res);
   CHECK_EQ(100000/2, t.i);
   CHECK_EQ(10*4, t.c);
   CHECK_EQ(1000/8, t.s);
 }
 
 
 TEST(4) {
   // Test the VFP floating point instructions.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     double a;
     double b;
     double c;
     double d;
     double e;
     double f;
     double g;
     double h;
     int i;
     double m;
     double n;
     float x;
     float y;
   } T;
   T t;
 
   // Create a function that accepts &t, and loads, manipulates, and stores
   // the doubles and floats.
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
 
   if (CpuFeatures::IsSupported(VFP3)) {
     CpuFeatureScope scope(&assm, VFP3);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
@@ skipping 97 matching lines @@
     CHECK_EQ(4.25, t.c);
     CHECK_EQ(-4.1875, t.b);
     CHECK_EQ(1.5, t.a);
   }
 }
 
 
 TEST(5) {
   // Test the ARMv7 bitfield instructions.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(ARMv7)) {
     CpuFeatureScope scope(&assm, ARMv7);
     // On entry, r0 = 0xAAAAAAAA = 0b10..10101010.
     __ ubfx(r0, r0, 1, 12);  // 0b00..010101010101 = 0x555
     __ sbfx(r0, r0, 0, 5);   // 0b11..111111110101 = -11
     __ bfc(r0, 1, 3);        // 0b11..111111110001 = -15
     __ mov(r1, Operand(7));
     __ bfi(r0, r1, 3, 3);    // 0b11..111111111001 = -7
@@ skipping 14 matching lines @@
                 CALL_GENERATED_CODE(f, 0xAAAAAAAA, 0, 0, 0, 0));
     ::printf("f() = %d\n", res);
     CHECK_EQ(-7, res);
   }
 }
 
 
 TEST(6) {
   // Test saturating instructions.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(ARMv7)) {
     CpuFeatureScope scope(&assm, ARMv7);
     __ usat(r1, 8, Operand(r0));           // Sat 0xFFFF to 0-255 = 0xFF.
     __ usat(r2, 12, Operand(r0, ASR, 9));  // Sat (0xFFFF>>9) to 0-4095 = 0x7F.
     __ usat(r3, 1, Operand(r0, LSL, 16));  // Sat (0xFFFF<<16) to 0-1 = 0x0.
     __ add(r0, r1, Operand(r2));
     __ add(r0, r0, Operand(r3));
     __ mov(pc, Operand(lr));
@@ skipping 21 matching lines @@
   s32_f64,
   u32_f64
 };
 
 static void TestRoundingMode(VCVTTypes types,
                              VFPRoundingMode mode,
                              double value,
                              int expected,
                              bool expected_exception = false) {
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP3)) {
     CpuFeatureScope scope(&assm, VFP3);
 
     Label wrong_exception;
 
     __ vmrs(r1);
     // Set custom FPSCR.
     __ bic(r2, r1, Operand(kVFPRoundingModeMask | kVFPExceptionMask));
@@ skipping 155 matching lines @@
   TestRoundingMode(u32_f64, RN, (kMaxInt + 0.5),
                                 static_cast<uint32_t>(kMaxInt) + 1);
   TestRoundingMode(u32_f64, RN, (kMaxUInt + 0.49), kMaxUInt);
   TestRoundingMode(u32_f64, RN, (kMaxUInt + 0.5), kMaxUInt, true);
   TestRoundingMode(u32_f64, RN, (kMaxUInt + 1.0), kMaxUInt, true);
 }
 
 TEST(8) {
   // Test VFP multi load/store with ia_w.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     double a;
     double b;
     double c;
     double d;
     double e;
     double f;
     double g;
     double h;
   } D;
   D d;
 
   typedef struct {
     float a;
     float b;
     float c;
     float d;
     float e;
     float f;
     float g;
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
     CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, a)));
@@ skipping 63 matching lines @@
     CHECK_EQ(4.0, f.f);
     CHECK_EQ(5.0, f.g);
     CHECK_EQ(6.0, f.h);
   }
 }
 
 
 TEST(9) {
   // Test VFP multi load/store with ia.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     double a;
     double b;
     double c;
     double d;
     double e;
     double f;
     double g;
     double h;
   } D;
   D d;
 
   typedef struct {
     float a;
     float b;
     float c;
     float d;
     float e;
     float f;
     float g;
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
     CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, a)));
@@ skipping 67 matching lines @@
     CHECK_EQ(4.0, f.f);
     CHECK_EQ(5.0, f.g);
     CHECK_EQ(6.0, f.h);
   }
 }
 
 
 TEST(10) {
   // Test VFP multi load/store with db_w.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     double a;
     double b;
     double c;
     double d;
     double e;
     double f;
     double g;
     double h;
   } D;
   D d;
 
   typedef struct {
     float a;
     float b;
     float c;
     float d;
     float e;
     float f;
     float g;
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
     CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, h) + 8));
@@ skipping 63 matching lines @@
     CHECK_EQ(4.0, f.f);
     CHECK_EQ(5.0, f.g);
     CHECK_EQ(6.0, f.h);
   }
 }
 
 
 TEST(11) {
   // Test instructions using the carry flag.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   typedef struct {
     int32_t a;
     int32_t b;
     int32_t c;
     int32_t d;
   } I;
   I i;
 
   i.a = 0xabcd0001;
   i.b = 0xabcd0000;
 
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   // Test HeapObject untagging.
   __ ldr(r1, MemOperand(r0, OFFSET_OF(I, a)));
   __ mov(r1, Operand(r1, ASR, 1), SetCC);
   __ adc(r1, r1, Operand(r1), LeaveCC, cs);
   __ str(r1, MemOperand(r0, OFFSET_OF(I, a)));
 
   __ ldr(r2, MemOperand(r0, OFFSET_OF(I, b)));
   __ mov(r2, Operand(r2, ASR, 1), SetCC);
@@ skipping 32 matching lines @@
   CHECK_EQ(0xabcd0001, i.a);
   CHECK_EQ(static_cast<int32_t>(0xabcd0000) >> 1, i.b);
   CHECK_EQ(0x00000000, i.c);
   CHECK_EQ(0xffffffff, i.d);
 }
 
 
 TEST(12) {
   // Test chaining of label usages within instructions (issue 1644).
   InitializeVM();
-  v8::HandleScope scope;
-  Assembler assm(Isolate::Current(), NULL, 0);
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
+  Assembler assm(isolate, NULL, 0);
   Label target;
   __ b(eq, &target);
   __ b(ne, &target);
   __ bind(&target);
   __ nop();
 }
 
 
 TEST(13) {
   // Test VFP instructions using registers d16-d31.
   InitializeVM();
-  v8::HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   if (!CpuFeatures::IsSupported(VFP32DREGS)) {
     return;
   }
 
   typedef struct {
     double a;
     double b;
     double c;
     double x;
     double y;
     double z;
     double i;
     double j;
     double k;
   } T;
   T t;
 
   // Create a function that accepts &t, and loads, manipulates, and stores
   // the doubles and floats.
-  Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
 
   if (CpuFeatures::IsSupported(VFP3)) {
     CpuFeatureScope scope(&assm, VFP3);
 
     __ stm(db_w, sp, r4.bit() | lr.bit());
 
     // Load a, b, c into d16, d17, d18.
@@ skipping 74 matching lines @@
     CHECK_EQ(2.75, t.x);
     CHECK_EQ(1.5, t.y);
     CHECK_EQ(17.0, t.z);
     CHECK_EQ(14.7610017472335499, t.i);
     CHECK_EQ(16.0, t.j);
     CHECK_EQ(73.8818412254460241, t.k);
   }
 }
 
 #undef __