test/cctest/test-macro-assembler-x64.cc - Issue 390004: Fix warnings on Win64.

Unified Diff: test/cctest/test-macro-assembler-x64.cc

Issue 390004: Fix warnings on Win64. (Closed)

Patch Set: Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

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 f344ac864e4e3502a7a35e4bd83dd7abb9f22a65..511b933a50b79aba5222828a64f8e745cf9889e6 100755

--- a/test/cctest/test-macro-assembler-x64.cc

+++ b/test/cctest/test-macro-assembler-x64.cc

@@ -133,7 +133,7 @@ TEST(SmiMove) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler; // Create a pointer for the __ macro.

masm->set_allow_stub_calls(false);

Label exit;

@@ -218,7 +218,7 @@ TEST(SmiCompare) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -265,7 +265,7 @@ TEST(Integer32ToSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -364,7 +364,7 @@ void TestI64PlusConstantToSmi(MacroAssembler* masm,

int64_t result = x + y;

ASSERT(Smi::IsValid(result));

__ movl(rax, Immediate(id));

- __ Move(r8, Smi::FromInt(result));

+ __ Move(r8, Smi::FromInt(static_cast<int>(result)));

__ movq(rcx, x, RelocInfo::NONE);

__ movq(r11, rcx);

__ Integer64PlusConstantToSmi(rdx, rcx, y);

@@ -390,7 +390,7 @@ TEST(Integer64PlusConstantToSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -431,7 +431,7 @@ TEST(SmiCheck) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -676,7 +676,7 @@ TEST(SmiNeg) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -761,7 +761,7 @@ TEST(SmiAdd) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -948,7 +948,7 @@ TEST(SmiSub) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1035,7 +1035,7 @@ TEST(SmiMul) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1138,7 +1138,7 @@ TEST(SmiDiv) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1245,7 +1245,7 @@ TEST(SmiMod) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1338,7 +1338,7 @@ TEST(SmiIndex) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1404,7 +1404,7 @@ TEST(SmiSelectNonSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false); // Avoid inline checks.

@@ -1480,7 +1480,7 @@ TEST(SmiAnd) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1558,7 +1558,7 @@ TEST(SmiOr) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1638,7 +1638,7 @@ TEST(SmiXor) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1702,7 +1702,7 @@ TEST(SmiNot) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1843,7 +1843,7 @@ TEST(SmiShiftLeft) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1880,7 +1880,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

int shift = shifts[i];

intptr_t result = static_cast<unsigned int>(x) >> shift;

if (Smi::IsValid(result)) {

- __ Move(r8, Smi::FromInt(result));

+ __ Move(r8, Smi::FromInt(static_cast<int>(result)));

__ Move(rcx, Smi::FromInt(x));

__ SmiShiftLogicalRightConstant(r9, rcx, shift, exit);

@@ -1946,7 +1946,7 @@ TEST(SmiShiftLogicalRight) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -2012,7 +2012,7 @@ TEST(SmiShiftArithmeticRight) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -2073,7 +2073,7 @@ TEST(PositiveSmiTimesPowerOfTwoToInteger64) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, actual_size);

+ MacroAssembler assembler(buffer, static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

« src/api.cc ('K') | « test/cctest/test-log-utils.cc ('k') | test/cctest/test-parsing.cc » ('j') | no next file with comments »