Fix android debug build.

TBR=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/430123002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22743 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/compiler/gap-resolver.cc

@@ -17,7 +17,8 @@ typedef ZoneList<MoveOperands>::iterator op_iterator;
 #ifdef ENABLE_SLOW_ASSERTS
 // TODO(svenpanne) Brush up InstructionOperand with comparison?
 struct InstructionOperandComparator {
-  bool operator()(const InstructionOperand* x, const InstructionOperand* y) {
+  bool operator()(const InstructionOperand* x,
+                  const InstructionOperand* y) const {
     return (x->kind() < y->kind()) ||
            (x->kind() == y->kind() && x->index() < y->index());
   }

src/compiler/instruction.h

@@ -265,7 +265,7 @@ class UnallocatedOperand : public InstructionOperand {
 };
 
 
-class MoveOperands V8_FINAL BASE_EMBEDDED {
+class MoveOperands V8_FINAL {
  public:
   MoveOperands(InstructionOperand* source, InstructionOperand* destination)
       : source_(source), destination_(destination) {}

test/cctest/compiler/codegen-tester.h

@@ -142,14 +142,14 @@ class StructuredMachineAssemblerTester
 
 static const bool USE_RESULT_BUFFER = true;
 static const bool USE_RETURN_REGISTER = false;
+static const int32_t CHECK_VALUE = 0x99BEEDCE;
+
 
 // TODO(titzer): use the C-style calling convention, or any register-based
 // calling convention for binop tests.
 template <typename CType, MachineRepresentation rep, bool use_result_buffer>
 class BinopTester {
  public:
-  static const int32_t CHECK_VALUE = 0x99BEEDCE;
-
   explicit BinopTester(RawMachineAssemblerTester<int32_t>* tester)
       : T(tester),
         param0(T->LoadFromPointer(&p0, rep)),

test/cctest/compiler/test-gap-resolver.cc

@@ -123,7 +123,8 @@ class ParallelMoveCreator : public HandleAndZoneScope {
 
  private:
   struct InstructionOperandComparator {
-    bool operator()(const InstructionOperand* x, const InstructionOperand* y) {
+    bool operator()(const InstructionOperand* x,
+                    const InstructionOperand* y) const {
       return (x->kind() < y->kind()) ||
              (x->kind() == y->kind() && x->index() < y->index());
     }