Index: runtime/vm/assembler_x64_test.cc |
diff --git a/runtime/vm/assembler_x64_test.cc b/runtime/vm/assembler_x64_test.cc |
index 681a5997dea57b2d4097171f45d326c91d411ff1..8a3c373630a0d1962a8fde7dc82778c80a2b4e5c 100644 |
--- a/runtime/vm/assembler_x64_test.cc |
+++ b/runtime/vm/assembler_x64_test.cc |
@@ -3113,6 +3113,8 @@ ASSEMBLER_TEST_RUN(TestObjectCompare, test) { |
ASSEMBLER_TEST_GENERATE(TestNop, assembler) { |
+ __ RawEntry(); |
+ |
__ nop(1); |
__ nop(2); |
__ nop(3); |
@@ -3128,12 +3130,14 @@ ASSEMBLER_TEST_GENERATE(TestNop, assembler) { |
ASSEMBLER_TEST_RUN(TestNop, test) { |
typedef int (*TestNop)(); |
- int res = reinterpret_cast<TestNop>(test->entry())(); |
+ int res = reinterpret_cast<TestNop>(test->payload_start())(); |
EXPECT_EQ(36, res); // 36 nop bytes emitted. |
} |
ASSEMBLER_TEST_GENERATE(TestAlign0, assembler) { |
+ __ RawEntry(); |
+ |
__ Align(4, 0); |
__ movq(RAX, Immediate(assembler->CodeSize())); // Return code size. |
__ ret(); |
@@ -3142,12 +3146,14 @@ ASSEMBLER_TEST_GENERATE(TestAlign0, assembler) { |
ASSEMBLER_TEST_RUN(TestAlign0, test) { |
typedef int (*TestAlign0)(); |
- int res = reinterpret_cast<TestAlign0>(test->entry())(); |
+ int res = reinterpret_cast<TestAlign0>(test->payload_start())(); |
EXPECT_EQ(0, res); // 0 bytes emitted. |
} |
ASSEMBLER_TEST_GENERATE(TestAlign1, assembler) { |
+ __ RawEntry(); |
+ |
__ nop(1); |
__ Align(4, 0); |
__ movq(RAX, Immediate(assembler->CodeSize())); // Return code size. |
@@ -3157,12 +3163,14 @@ ASSEMBLER_TEST_GENERATE(TestAlign1, assembler) { |
ASSEMBLER_TEST_RUN(TestAlign1, test) { |
typedef int (*TestAlign1)(); |
- int res = reinterpret_cast<TestAlign1>(test->entry())(); |
+ int res = reinterpret_cast<TestAlign1>(test->payload_start())(); |
EXPECT_EQ(4, res); // 4 bytes emitted. |
} |
ASSEMBLER_TEST_GENERATE(TestAlign1Offset1, assembler) { |
+ __ RawEntry(); |
+ |
__ nop(1); |
__ Align(4, 1); |
__ movq(RAX, Immediate(assembler->CodeSize())); // Return code size. |
@@ -3172,12 +3180,14 @@ ASSEMBLER_TEST_GENERATE(TestAlign1Offset1, assembler) { |
ASSEMBLER_TEST_RUN(TestAlign1Offset1, test) { |
typedef int (*TestAlign1Offset1)(); |
- int res = reinterpret_cast<TestAlign1Offset1>(test->entry())(); |
+ int res = reinterpret_cast<TestAlign1Offset1>(test->payload_start())(); |
EXPECT_EQ(3, res); // 3 bytes emitted. |
} |
ASSEMBLER_TEST_GENERATE(TestAlignLarge, assembler) { |
+ __ RawEntry(); |
+ |
__ nop(1); |
__ Align(16, 0); |
__ movq(RAX, Immediate(assembler->CodeSize())); // Return code size. |
@@ -3187,7 +3197,7 @@ ASSEMBLER_TEST_GENERATE(TestAlignLarge, assembler) { |
ASSEMBLER_TEST_RUN(TestAlignLarge, test) { |
typedef int (*TestAlignLarge)(); |
- int res = reinterpret_cast<TestAlignLarge>(test->entry())(); |
+ int res = reinterpret_cast<TestAlignLarge>(test->payload_start())(); |
EXPECT_EQ(16, res); // 16 bytes emitted. |
} |