| Index: test/cctest/test-macro-assembler-x64.cc
|
| diff --git a/test/cctest/test-macro-assembler-x64.cc b/test/cctest/test-macro-assembler-x64.cc
|
| index 044ebe4aa1bdfbc8127d60dd000e708cada68fd6..d4d0edb6917d12375e2d6b6ea607ae56b2f31566 100755
|
| --- a/test/cctest/test-macro-assembler-x64.cc
|
| +++ b/test/cctest/test-macro-assembler-x64.cc
|
| @@ -157,10 +157,9 @@ TEST(SmiMove) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
| MacroAssembler* masm = &assembler; // Create a pointer for the __ macro.
|
| masm->set_allow_stub_calls(false);
|
| EntryCode(masm);
|
| @@ -247,10 +246,9 @@ TEST(SmiCompare) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -299,10 +297,9 @@ TEST(Integer32ToSmi) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -429,10 +426,9 @@ TEST(Integer64PlusConstantToSmi) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -475,10 +471,9 @@ TEST(SmiCheck) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -725,10 +720,9 @@ TEST(SmiNeg) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -815,10 +809,9 @@ TEST(SmiAdd) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1007,10 +1000,9 @@ TEST(SmiSub) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1099,10 +1091,9 @@ TEST(SmiMul) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1207,10 +1198,9 @@ TEST(SmiDiv) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1319,10 +1309,9 @@ TEST(SmiMod) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1417,10 +1406,9 @@ TEST(SmiIndex) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1488,10 +1476,9 @@ TEST(SmiSelectNonSmi) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false); // Avoid inline checks.
|
| @@ -1569,10 +1556,9 @@ TEST(SmiAnd) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1652,10 +1638,9 @@ TEST(SmiOr) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1737,10 +1722,9 @@ TEST(SmiXor) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1806,10 +1790,9 @@ TEST(SmiNot) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -1904,10 +1887,9 @@ TEST(SmiShiftLeft) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -2012,10 +1994,9 @@ TEST(SmiShiftLogicalRight) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -2083,10 +2064,9 @@ TEST(SmiShiftArithmeticRight) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -2149,10 +2129,9 @@ TEST(PositiveSmiTimesPowerOfTwoToInteger64) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
| @@ -2194,10 +2173,9 @@ TEST(OperandOffset) {
|
| &actual_size,
|
| true));
|
| CHECK(buffer);
|
| - HandleScope handles;
|
| - MacroAssembler assembler(Isolate::Current(),
|
| - buffer,
|
| - static_cast<int>(actual_size));
|
| + Isolate* isolate = Isolate::Current();
|
| + HandleScope handles(isolate);
|
| + MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
|
|
|
| MacroAssembler* masm = &assembler;
|
| masm->set_allow_stub_calls(false);
|
|
|