Reviewers: Sven Panne,
Message:
Committed patchset #1 manually as r22743 (tree was closed).
Description:
Fix android debug build.
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=22743
Please review this at https://codereview.chromium.org/430123002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -5 lines):
M src/compiler/gap-resolver.cc
M src/compiler/instruction.h
M test/cctest/compiler/codegen-tester.h
M test/cctest/compiler/test-gap-resolver.cc
Index: src/compiler/gap-resolver.cc
diff --git a/src/compiler/gap-resolver.cc b/src/compiler/gap-resolver.cc
index
bc151c2c305efbfc5fb6a41031c350c8a240f1ea..a8dbbc0f79956e29b02eeeb274066e375603e55f
100644
--- a/src/compiler/gap-resolver.cc
+++ b/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());
}
Index: src/compiler/instruction.h
diff --git a/src/compiler/instruction.h b/src/compiler/instruction.h
index
3c8a5c54ea34c31c86d0dc5120a312cb628f86c3..92f95f4a13cf412afc8f73f2dadf73535cc58a7c
100644
--- a/src/compiler/instruction.h
+++ b/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) {}
Index: test/cctest/compiler/codegen-tester.h
diff --git a/test/cctest/compiler/codegen-tester.h
b/test/cctest/compiler/codegen-tester.h
index
0fd3040b680931f302c1bf38c1edeff663394201..37efc49137798b31b5d284c12ffa1c7457103ed7
100644
--- a/test/cctest/compiler/codegen-tester.h
+++ b/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)),
Index: test/cctest/compiler/test-gap-resolver.cc
diff --git a/test/cctest/compiler/test-gap-resolver.cc
b/test/cctest/compiler/test-gap-resolver.cc
index
60a476286157ce4be31d58a6be155feb2495c7cd..00c220945da891cdd4accfd4cc01f0c27d581db0
100644
--- a/test/cctest/compiler/test-gap-resolver.cc
+++ b/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());
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
