Commit 61d6db07 authored by Tom Tan's avatar Tom Tan Committed by Commit Bot

Renaming variables which conflict with macro definition in Windows SDK

Windows SDK defines `near` and `far` as macro in minwindef.h, so they cannot be
used as variable name if Windows SDK header file is included for Windows build.

Bug: chromium:893460
Change-Id: I5ed1076b965979b8e4e09958c1b6f0a698ec8d4f
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1783839Reviewed-by: 's avatarSigurd Schneider <sigurds@chromium.org>
Commit-Queue: Tom Tan <Tom.Tan@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#63559}
parent b7ade853
...@@ -2019,17 +2019,19 @@ TEST(far_branch_backward) { ...@@ -2019,17 +2019,19 @@ TEST(far_branch_backward) {
START(); START();
Label done, fail; Label done, fail;
Label near, far, in_range, out_of_range; // Avoid using near and far as variable name because both are defined as
// macro in minwindef.h from Windows SDK.
Label near_label, far_label, in_range, out_of_range;
__ Mov(x0, 0); __ Mov(x0, 0);
__ Mov(x1, 1); __ Mov(x1, 1);
__ Mov(x10, 0); __ Mov(x10, 0);
__ B(&near); __ B(&near_label);
__ Bind(&in_range); __ Bind(&in_range);
__ Orr(x0, x0, 1 << 0); __ Orr(x0, x0, 1 << 0);
__ B(&far); __ B(&far_label);
__ Bind(&out_of_range); __ Bind(&out_of_range);
__ Orr(x0, x0, 1 << 1); __ Orr(x0, x0, 1 << 1);
...@@ -2053,19 +2055,19 @@ TEST(far_branch_backward) { ...@@ -2053,19 +2055,19 @@ TEST(far_branch_backward) {
// close to the limit. // close to the limit.
GenerateLandingNops(&masm, budget - kSlack, &fail); GenerateLandingNops(&masm, budget - kSlack, &fail);
__ Bind(&near); __ Bind(&near_label);
switch (type) { switch (type) {
case TestBranchType: case TestBranchType:
__ Tbz(x10, 3, &in_range); __ Tbz(x10, 3, &in_range);
// This should be: // This should be:
// TBZ <in_range> // TBZ <in_range>
CHECK_EQ(1 * kInstrSize, __ SizeOfCodeGeneratedSince(&near)); CHECK_EQ(1 * kInstrSize, __ SizeOfCodeGeneratedSince(&near_label));
break; break;
case CompareBranchType: case CompareBranchType:
__ Cbz(x10, &in_range); __ Cbz(x10, &in_range);
// This should be: // This should be:
// CBZ <in_range> // CBZ <in_range>
CHECK_EQ(1 * kInstrSize, __ SizeOfCodeGeneratedSince(&near)); CHECK_EQ(1 * kInstrSize, __ SizeOfCodeGeneratedSince(&near_label));
break; break;
case CondBranchType: case CondBranchType:
__ Cmp(x10, 0); __ Cmp(x10, 0);
...@@ -2073,7 +2075,7 @@ TEST(far_branch_backward) { ...@@ -2073,7 +2075,7 @@ TEST(far_branch_backward) {
// This should be: // This should be:
// CMP // CMP
// B.EQ <in_range> // B.EQ <in_range>
CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&near)); CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&near_label));
break; break;
default: default:
UNREACHABLE(); UNREACHABLE();
...@@ -2083,7 +2085,7 @@ TEST(far_branch_backward) { ...@@ -2083,7 +2085,7 @@ TEST(far_branch_backward) {
// Now go past the limit so that branches are now out of range. // Now go past the limit so that branches are now out of range.
GenerateLandingNops(&masm, kSlack * 2, &fail); GenerateLandingNops(&masm, kSlack * 2, &fail);
__ Bind(&far); __ Bind(&far_label);
switch (type) { switch (type) {
case TestBranchType: case TestBranchType:
__ Tbz(x10, 5, &out_of_range); __ Tbz(x10, 5, &out_of_range);
...@@ -2091,7 +2093,7 @@ TEST(far_branch_backward) { ...@@ -2091,7 +2093,7 @@ TEST(far_branch_backward) {
// TBNZ <skip> // TBNZ <skip>
// B <out_of_range> // B <out_of_range>
// skip: // skip:
CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&far)); CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&far_label));
break; break;
case CompareBranchType: case CompareBranchType:
__ Cbz(x10, &out_of_range); __ Cbz(x10, &out_of_range);
...@@ -2099,7 +2101,7 @@ TEST(far_branch_backward) { ...@@ -2099,7 +2101,7 @@ TEST(far_branch_backward) {
// CBNZ <skip> // CBNZ <skip>
// B <out_of_range> // B <out_of_range>
// skip: // skip:
CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&far)); CHECK_EQ(2 * kInstrSize, __ SizeOfCodeGeneratedSince(&far_label));
break; break;
case CondBranchType: case CondBranchType:
__ Cmp(x10, 0); __ Cmp(x10, 0);
...@@ -2109,7 +2111,7 @@ TEST(far_branch_backward) { ...@@ -2109,7 +2111,7 @@ TEST(far_branch_backward) {
// B.NE <skip> // B.NE <skip>
// B <out_of_range> // B <out_of_range>
// skip: // skip:
CHECK_EQ(3 * kInstrSize, __ SizeOfCodeGeneratedSince(&far)); CHECK_EQ(3 * kInstrSize, __ SizeOfCodeGeneratedSince(&far_label));
break; break;
default: default:
UNREACHABLE(); UNREACHABLE();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment