Index: src/hydrogen.h |
diff --git a/src/hydrogen.h b/src/hydrogen.h |
index c21a760063d4945188883fa1ff37d0aa812bfad7..af31b60a5bc009c61bef2b42a60df546946b6c8e 100644 |
--- a/src/hydrogen.h |
+++ b/src/hydrogen.h |
@@ -53,7 +53,7 @@ class LChunk; |
class LiveRange; |
-class HBasicBlock FINAL : public ZoneObject { |
+class HBasicBlock V8_FINAL : public ZoneObject { |
public: |
explicit HBasicBlock(HGraph* graph); |
~HBasicBlock() { } |
@@ -220,7 +220,7 @@ class HBasicBlock FINAL : public ZoneObject { |
}; |
-class HPredecessorIterator FINAL BASE_EMBEDDED { |
+class HPredecessorIterator V8_FINAL BASE_EMBEDDED { |
public: |
explicit HPredecessorIterator(HBasicBlock* block) |
: predecessor_list_(block->predecessors()), current_(0) { } |
@@ -235,7 +235,7 @@ class HPredecessorIterator FINAL BASE_EMBEDDED { |
}; |
-class HInstructionIterator FINAL BASE_EMBEDDED { |
+class HInstructionIterator V8_FINAL BASE_EMBEDDED { |
public: |
explicit HInstructionIterator(HBasicBlock* block) |
: instr_(block->first()) { |
@@ -255,7 +255,7 @@ class HInstructionIterator FINAL BASE_EMBEDDED { |
}; |
-class HLoopInformation FINAL : public ZoneObject { |
+class HLoopInformation V8_FINAL : public ZoneObject { |
public: |
HLoopInformation(HBasicBlock* loop_header, Zone* zone) |
: back_edges_(4, zone), |
@@ -303,7 +303,7 @@ class HLoopInformation FINAL : public ZoneObject { |
class BoundsCheckTable; |
class InductionVariableBlocksTable; |
-class HGraph FINAL : public ZoneObject { |
+class HGraph V8_FINAL : public ZoneObject { |
public: |
explicit HGraph(CompilationInfo* info); |
@@ -523,7 +523,7 @@ enum FrameType { |
}; |
-class HEnvironment FINAL : public ZoneObject { |
+class HEnvironment V8_FINAL : public ZoneObject { |
public: |
HEnvironment(HEnvironment* outer, |
Scope* scope, |
@@ -793,37 +793,37 @@ class AstContext { |
}; |
-class EffectContext FINAL : public AstContext { |
+class EffectContext V8_FINAL : public AstContext { |
public: |
explicit EffectContext(HOptimizedGraphBuilder* owner) |
: AstContext(owner, Expression::kEffect) { |
} |
virtual ~EffectContext(); |
- virtual void ReturnValue(HValue* value) OVERRIDE; |
+ virtual void ReturnValue(HValue* value) V8_OVERRIDE; |
virtual void ReturnInstruction(HInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnControl(HControlInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnContinuation(HIfContinuation* continuation, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
}; |
-class ValueContext FINAL : public AstContext { |
+class ValueContext V8_FINAL : public AstContext { |
public: |
ValueContext(HOptimizedGraphBuilder* owner, ArgumentsAllowedFlag flag) |
: AstContext(owner, Expression::kValue), flag_(flag) { |
} |
virtual ~ValueContext(); |
- virtual void ReturnValue(HValue* value) OVERRIDE; |
+ virtual void ReturnValue(HValue* value) V8_OVERRIDE; |
virtual void ReturnInstruction(HInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnControl(HControlInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnContinuation(HIfContinuation* continuation, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
bool arguments_allowed() { return flag_ == ARGUMENTS_ALLOWED; } |
@@ -832,7 +832,7 @@ class ValueContext FINAL : public AstContext { |
}; |
-class TestContext FINAL : public AstContext { |
+class TestContext V8_FINAL : public AstContext { |
public: |
TestContext(HOptimizedGraphBuilder* owner, |
Expression* condition, |
@@ -844,13 +844,13 @@ class TestContext FINAL : public AstContext { |
if_false_(if_false) { |
} |
- virtual void ReturnValue(HValue* value) OVERRIDE; |
+ virtual void ReturnValue(HValue* value) V8_OVERRIDE; |
virtual void ReturnInstruction(HInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnControl(HControlInstruction* instr, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
virtual void ReturnContinuation(HIfContinuation* continuation, |
- BailoutId ast_id) OVERRIDE; |
+ BailoutId ast_id) V8_OVERRIDE; |
static TestContext* cast(AstContext* context) { |
ASSERT(context->IsTest()); |
@@ -872,7 +872,7 @@ class TestContext FINAL : public AstContext { |
}; |
-class FunctionState FINAL { |
+class FunctionState V8_FINAL { |
public: |
FunctionState(HOptimizedGraphBuilder* owner, |
CompilationInfo* info, |
@@ -939,7 +939,7 @@ class FunctionState FINAL { |
}; |
-class HIfContinuation FINAL { |
+class HIfContinuation V8_FINAL { |
public: |
HIfContinuation() { continuation_captured_ = false; } |
~HIfContinuation() { ASSERT(!continuation_captured_); } |
@@ -1278,7 +1278,7 @@ class HGraphBuilder { |
void AddIncrementCounter(StatsCounter* counter, |
HValue* context); |
- class IfBuilder FINAL { |
+ class IfBuilder V8_FINAL { |
public: |
explicit IfBuilder(HGraphBuilder* builder, |
int position = RelocInfo::kNoPosition); |
@@ -1408,7 +1408,7 @@ class HGraphBuilder { |
HBasicBlock* merge_block_; |
}; |
- class LoopBuilder FINAL { |
+ class LoopBuilder V8_FINAL { |
public: |
enum Direction { |
kPreIncrement, |
@@ -1449,7 +1449,7 @@ class HGraphBuilder { |
void BuildNewSpaceArrayCheck(HValue* length, |
ElementsKind kind); |
- class JSArrayBuilder FINAL { |
+ class JSArrayBuilder V8_FINAL { |
public: |
JSArrayBuilder(HGraphBuilder* builder, |
ElementsKind kind, |
@@ -1648,12 +1648,13 @@ inline HInstruction* HGraphBuilder::NewUncasted<HContext>() { |
} |
-class HOptimizedGraphBuilder FINAL : public HGraphBuilder, public AstVisitor { |
+class HOptimizedGraphBuilder V8_FINAL |
+ : public HGraphBuilder, public AstVisitor { |
public: |
// A class encapsulating (lazily-allocated) break and continue blocks for |
// a breakable statement. Separated from BreakAndContinueScope so that it |
// can have a separate lifetime. |
- class BreakAndContinueInfo FINAL BASE_EMBEDDED { |
+ class BreakAndContinueInfo V8_FINAL BASE_EMBEDDED { |
public: |
explicit BreakAndContinueInfo(BreakableStatement* target, |
int drop_extra = 0) |
@@ -1679,7 +1680,7 @@ class HOptimizedGraphBuilder FINAL : public HGraphBuilder, public AstVisitor { |
// A helper class to maintain a stack of current BreakAndContinueInfo |
// structures mirroring BreakableStatement nesting. |
- class BreakAndContinueScope FINAL BASE_EMBEDDED { |
+ class BreakAndContinueScope V8_FINAL BASE_EMBEDDED { |
public: |
BreakAndContinueScope(BreakAndContinueInfo* info, |
HOptimizedGraphBuilder* owner) |
@@ -1705,7 +1706,7 @@ class HOptimizedGraphBuilder FINAL : public HGraphBuilder, public AstVisitor { |
explicit HOptimizedGraphBuilder(CompilationInfo* info); |
- virtual bool BuildGraph() OVERRIDE; |
+ virtual bool BuildGraph() V8_OVERRIDE; |
// Simple accessors. |
BreakAndContinueScope* break_scope() const { return break_scope_; } |
@@ -1891,9 +1892,9 @@ class HOptimizedGraphBuilder FINAL : public HGraphBuilder, public AstVisitor { |
template <class Instruction> HInstruction* PreProcessCall(Instruction* call); |
void SetUpScope(Scope* scope); |
- virtual void VisitStatements(ZoneList<Statement*>* statements) OVERRIDE; |
+ virtual void VisitStatements(ZoneList<Statement*>* statements) V8_OVERRIDE; |
-#define DECLARE_VISIT(type) virtual void Visit##type(type* node) OVERRIDE; |
+#define DECLARE_VISIT(type) virtual void Visit##type(type* node) V8_OVERRIDE; |
AST_NODE_LIST(DECLARE_VISIT) |
#undef DECLARE_VISIT |
@@ -2172,7 +2173,7 @@ class HOptimizedGraphBuilder FINAL : public HGraphBuilder, public AstVisitor { |
Zone* AstContext::zone() const { return owner_->zone(); } |
-class HStatistics FINAL: public Malloced { |
+class HStatistics V8_FINAL: public Malloced { |
public: |
HStatistics() |
: timing_(5), |
@@ -2231,7 +2232,7 @@ class HPhase : public CompilationPhase { |
}; |
-class HTracer FINAL : public Malloced { |
+class HTracer V8_FINAL : public Malloced { |
public: |
explicit HTracer(int isolate_id) |
: trace_(&string_allocator_), indent_(0) { |
@@ -2252,7 +2253,7 @@ class HTracer FINAL : public Malloced { |
void TraceLiveRanges(const char* name, LAllocator* allocator); |
private: |
- class Tag FINAL BASE_EMBEDDED { |
+ class Tag V8_FINAL BASE_EMBEDDED { |
public: |
Tag(HTracer* tracer, const char* name) { |
name_ = name; |
@@ -2317,7 +2318,7 @@ class HTracer FINAL : public Malloced { |
}; |
-class NoObservableSideEffectsScope FINAL { |
+class NoObservableSideEffectsScope V8_FINAL { |
public: |
explicit NoObservableSideEffectsScope(HGraphBuilder* builder) : |
builder_(builder) { |