Move RMA::Label out of the class, so it can be forward declared.

test/cctest/compiler/test-branch-combine.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(jochen): Remove this after the setting is turned on globally.
 #define V8_IMMINENT_DEPRECATION_WARNINGS
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/value-helper.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-typedef RawMachineAssembler::Label MLabel;
-
 static IrOpcode::Value int32cmp_opcodes[] = {
     IrOpcode::kWord32Equal, IrOpcode::kInt32LessThan,
     IrOpcode::kInt32LessThanOrEqual, IrOpcode::kUint32LessThan,
     IrOpcode::kUint32LessThanOrEqual};
 
 
 TEST(BranchCombineWord32EqualZero_1) {
   // Test combining a branch with x == 0
   RawMachineAssemblerTester<int32_t> m(kMachInt32);
   int32_t eq_constant = -1033;
   int32_t ne_constant = 825118;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Word32Equal(p0, m.Int32Constant(0)), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_INT32_INPUTS(i) {
     int32_t a = *i;
     int32_t expect = a == 0 ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineWord32EqualZero_chain) {
   // Test combining a branch with a chain of x == 0 == 0 == 0 ...
   int32_t eq_constant = -1133;
   int32_t ne_constant = 815118;
 
   for (int k = 0; k < 6; k++) {
     RawMachineAssemblerTester<int32_t> m(kMachInt32);
     Node* p0 = m.Parameter(0);
-    MLabel blocka, blockb;
+    RawMachineLabel blocka, blockb;
     Node* cond = p0;
     for (int j = 0; j < k; j++) {
       cond = m.Word32Equal(cond, m.Int32Constant(0));
     }
     m.Branch(cond, &blocka, &blockb);
     m.Bind(&blocka);
     m.Return(m.Int32Constant(eq_constant));
     m.Bind(&blockb);
     m.Return(m.Int32Constant(ne_constant));
 
     FOR_INT32_INPUTS(i) {
       int32_t a = *i;
       int32_t expect = (k & 1) == 1 ? (a == 0 ? eq_constant : ne_constant)
                                     : (a == 0 ? ne_constant : eq_constant);
       CHECK_EQ(expect, m.Call(a));
     }
   }
 }
 
 
 TEST(BranchCombineInt32LessThanZero_1) {
   // Test combining a branch with x < 0
   RawMachineAssemblerTester<int32_t> m(kMachInt32);
   int32_t eq_constant = -1433;
   int32_t ne_constant = 845118;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Int32LessThan(p0, m.Int32Constant(0)), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_INT32_INPUTS(i) {
     int32_t a = *i;
     int32_t expect = a < 0 ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineUint32LessThan100_1) {
   // Test combining a branch with x < 100
   RawMachineAssemblerTester<int32_t> m(kMachUint32);
   int32_t eq_constant = 1471;
   int32_t ne_constant = 88845718;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Uint32LessThan(p0, m.Int32Constant(100)), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_UINT32_INPUTS(i) {
     uint32_t a = *i;
     int32_t expect = a < 100 ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineUint32LessThanOrEqual100_1) {
   // Test combining a branch with x <= 100
   RawMachineAssemblerTester<int32_t> m(kMachUint32);
   int32_t eq_constant = 1479;
   int32_t ne_constant = 77845719;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Uint32LessThanOrEqual(p0, m.Int32Constant(100)), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_UINT32_INPUTS(i) {
     uint32_t a = *i;
     int32_t expect = a <= 100 ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineZeroLessThanInt32_1) {
   // Test combining a branch with 0 < x
   RawMachineAssemblerTester<int32_t> m(kMachInt32);
   int32_t eq_constant = -2033;
   int32_t ne_constant = 225118;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Int32LessThan(m.Int32Constant(0), p0), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_INT32_INPUTS(i) {
     int32_t a = *i;
     int32_t expect = 0 < a ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineInt32GreaterThanZero_1) {
   // Test combining a branch with x > 0
   RawMachineAssemblerTester<int32_t> m(kMachInt32);
   int32_t eq_constant = -1073;
   int32_t ne_constant = 825178;
   Node* p0 = m.Parameter(0);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Int32GreaterThan(p0, m.Int32Constant(0)), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_INT32_INPUTS(i) {
     int32_t a = *i;
     int32_t expect = a > 0 ? eq_constant : ne_constant;
     CHECK_EQ(expect, m.Call(a));
   }
 }
 
 
 TEST(BranchCombineWord32EqualP) {
   // Test combining a branch with an Word32Equal.
   RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
   int32_t eq_constant = -1035;
   int32_t ne_constant = 825018;
   Node* p0 = m.Parameter(0);
   Node* p1 = m.Parameter(1);
 
-  MLabel blocka, blockb;
+  RawMachineLabel blocka, blockb;
   m.Branch(m.Word32Equal(p0, p1), &blocka, &blockb);
   m.Bind(&blocka);
   m.Return(m.Int32Constant(eq_constant));
   m.Bind(&blockb);
   m.Return(m.Int32Constant(ne_constant));
 
   FOR_INT32_INPUTS(i) {
     FOR_INT32_INPUTS(j) {
       int32_t a = *i;
       int32_t b = *j;
       int32_t expect = a == b ? eq_constant : ne_constant;
       CHECK_EQ(expect, m.Call(a, b));
     }
   }
 }
 
 
 TEST(BranchCombineWord32EqualI) {
   int32_t eq_constant = -1135;
   int32_t ne_constant = 925718;
 
   for (int left = 0; left < 2; left++) {
     FOR_INT32_INPUTS(i) {
       RawMachineAssemblerTester<int32_t> m(kMachInt32);
       int32_t a = *i;
 
       Node* p0 = m.Int32Constant(a);
       Node* p1 = m.Parameter(0);
 
-      MLabel blocka, blockb;
+      RawMachineLabel blocka, blockb;
       if (left == 1) m.Branch(m.Word32Equal(p0, p1), &blocka, &blockb);
       if (left == 0) m.Branch(m.Word32Equal(p1, p0), &blocka, &blockb);
       m.Bind(&blocka);
       m.Return(m.Int32Constant(eq_constant));
       m.Bind(&blockb);
       m.Return(m.Int32Constant(ne_constant));
 
       FOR_INT32_INPUTS(j) {
         int32_t b = *j;
         int32_t expect = a == b ? eq_constant : ne_constant;
         CHECK_EQ(expect, m.Call(b));
       }
     }
   }
 }
 
 
 TEST(BranchCombineInt32CmpP) {
   int32_t eq_constant = -1235;
   int32_t ne_constant = 725018;
 
   for (int op = 0; op < 2; op++) {
     RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
     Node* p0 = m.Parameter(0);
     Node* p1 = m.Parameter(1);
 
-    MLabel blocka, blockb;
+    RawMachineLabel blocka, blockb;
     if (op == 0) m.Branch(m.Int32LessThan(p0, p1), &blocka, &blockb);
     if (op == 1) m.Branch(m.Int32LessThanOrEqual(p0, p1), &blocka, &blockb);
     m.Bind(&blocka);
     m.Return(m.Int32Constant(eq_constant));
     m.Bind(&blockb);
     m.Return(m.Int32Constant(ne_constant));
 
     FOR_INT32_INPUTS(i) {
       FOR_INT32_INPUTS(j) {
         int32_t a = *i;
@@ skipping 12 matching lines @@
   int32_t eq_constant = -1175;
   int32_t ne_constant = 927711;
 
   for (int op = 0; op < 2; op++) {
     FOR_INT32_INPUTS(i) {
       RawMachineAssemblerTester<int32_t> m(kMachInt32);
       int32_t a = *i;
       Node* p0 = m.Int32Constant(a);
       Node* p1 = m.Parameter(0);
 
-      MLabel blocka, blockb;
+      RawMachineLabel blocka, blockb;
       if (op == 0) m.Branch(m.Int32LessThan(p0, p1), &blocka, &blockb);
       if (op == 1) m.Branch(m.Int32LessThanOrEqual(p0, p1), &blocka, &blockb);
       m.Bind(&blocka);
       m.Return(m.Int32Constant(eq_constant));
       m.Bind(&blockb);
       m.Return(m.Int32Constant(ne_constant));
 
       FOR_INT32_INPUTS(j) {
         int32_t b = *j;
         int32_t expect = 0;
@@ skipping 35 matching lines @@
   CompareWrapper w;
   bool invert;
   bool true_first;
   int32_t eq_constant;
   int32_t ne_constant;
 
   CmpBranchGen(IrOpcode::Value opcode, bool i, bool t, int32_t eq, int32_t ne)
       : w(opcode), invert(i), true_first(t), eq_constant(eq), ne_constant(ne) {}
 
   virtual void gen(RawMachineAssemblerTester<int32_t>* m, Node* a, Node* b) {
-    MLabel blocka, blockb;
+    RawMachineLabel blocka, blockb;
     Node* cond = w.MakeNode(m, a, b);
     if (invert) cond = m->Word32Equal(cond, m->Int32Constant(0));
     m->Branch(cond, &blocka, &blockb);
     if (true_first) {
       m->Bind(&blocka);
       m->Return(m->Int32Constant(eq_constant));
       m->Bind(&blockb);
       m->Return(m->Int32Constant(ne_constant));
     } else {
       m->Bind(&blockb);
@@ skipping 78 matching lines @@
                            CompareWrapper(IrOpcode::kFloat64LessThan),
                            CompareWrapper(IrOpcode::kFloat64LessThanOrEqual)};
 
   for (size_t c = 0; c < arraysize(cmps); c++) {
     CompareWrapper cmp = cmps[c];
     for (int invert = 0; invert < 2; invert++) {
       RawMachineAssemblerTester<int32_t> m;
       Node* a = m.LoadFromPointer(&input_a, kMachFloat64);
       Node* b = m.LoadFromPointer(&input_b, kMachFloat64);
 
-      MLabel blocka, blockb;
+      RawMachineLabel blocka, blockb;
       Node* cond = cmp.MakeNode(&m, a, b);
       if (invert) cond = m.Word32Equal(cond, m.Int32Constant(0));
       m.Branch(cond, &blocka, &blockb);
       m.Bind(&blocka);
       m.Return(m.Int32Constant(eq_constant));
       m.Bind(&blockb);
       m.Return(m.Int32Constant(ne_constant));
 
       for (size_t i = 0; i < arraysize(inputs); ++i) {
         for (size_t j = 0; j < arraysize(inputs); ++j) {
           input_a = inputs[i];
           input_b = inputs[j];
           int32_t expected =
               invert ? (cmp.Float64Compare(input_a, input_b) ? ne_constant
                                                              : eq_constant)
                      : (cmp.Float64Compare(input_a, input_b) ? eq_constant
                                                              : ne_constant);
           CHECK_EQ(expected, m.Call());
         }
       }
     }
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8