Index: src/hydrogen.h |
diff --git a/src/hydrogen.h b/src/hydrogen.h |
index 3dbca3c3ead0aad9bbbd539d588752466947fde9..a6795a1f5af780ed68a4f177d038c9b34e66fb98 100644 |
--- a/src/hydrogen.h |
+++ b/src/hydrogen.h |
@@ -108,7 +108,7 @@ class HBasicBlock: public ZoneObject { |
bool Dominates(HBasicBlock* other) const; |
int LoopNestingDepth() const; |
- void SetInitialEnvironment(HEnvironment* env, BailoutId previous_id); |
+ void SetInitialEnvironment(HEnvironment* env); |
void ClearEnvironment() { last_environment_ = NULL; } |
bool HasEnvironment() const { return last_environment_ != NULL; } |
void UpdateEnvironment(HEnvironment* env) { last_environment_ = env; } |
@@ -484,8 +484,6 @@ class HEnvironment: public ZoneObject { |
BailoutId ast_id() const { return ast_id_; } |
void set_ast_id(BailoutId id) { ast_id_ = id; } |
- BailoutId previous_ast_id() const { return previous_ast_id_; } |
- void set_previous_ast_id(BailoutId id) { previous_ast_id_ = id; } |
HEnterInlined* entry() const { return entry_; } |
void set_entry(HEnterInlined* entry) { entry_ = entry; } |
@@ -647,7 +645,6 @@ class HEnvironment: public ZoneObject { |
int pop_count_; |
int push_count_; |
BailoutId ast_id_; |
- BailoutId previous_ast_id_; |
Zone* zone_; |
}; |
@@ -906,9 +903,8 @@ class HGraphBuilder { |
protected: |
virtual bool BuildGraph() = 0; |
- HBasicBlock* CreateBasicBlock(HEnvironment* envy, |
- BailoutId previous_ast_id); |
- HBasicBlock* CreateLoopHeaderBlock(BailoutId previous_ast_id); |
+ HBasicBlock* CreateBasicBlock(HEnvironment* envy); |
+ HBasicBlock* CreateLoopHeaderBlock(); |
// Building common constructs |
HInstruction* BuildExternalArrayElementAccess( |
@@ -956,7 +952,7 @@ class HGraphBuilder { |
class CheckBuilder { |
public: |
- explicit CheckBuilder(HGraphBuilder* builder); |
+ explicit CheckBuilder(HGraphBuilder* builder, BailoutId id); |
~CheckBuilder() { |
if (!finished_) End(); |
} |
@@ -978,7 +974,7 @@ class HGraphBuilder { |
class IfBuilder { |
public: |
- explicit IfBuilder(HGraphBuilder* builder); |
+ explicit IfBuilder(HGraphBuilder* builder, BailoutId id); |
~IfBuilder() { |
if (!finished_) End(); |
} |
@@ -1017,7 +1013,8 @@ class HGraphBuilder { |
LoopBuilder(HGraphBuilder* builder, |
HValue* context, |
- Direction direction); |
+ Direction direction, |
+ BailoutId id); |
~LoopBuilder() { |
ASSERT(finished_); |
} |
@@ -1066,7 +1063,8 @@ class HGraphBuilder { |
HValue* BuildAllocateElements(HValue* context, |
ElementsKind kind, |
- HValue* capacity); |
+ HValue* capacity, |
+ BailoutId ast_id); |
void BuildInitializeElements(HValue* elements, |
ElementsKind kind, |
@@ -1080,13 +1078,15 @@ class HGraphBuilder { |
HValue* elements, |
ElementsKind kind, |
HValue* length, |
- HValue* new_capacity); |
+ HValue* new_capacity, |
+ BailoutId ast_id); |
void BuildFillElementsWithHole(HValue* context, |
HValue* elements, |
ElementsKind elements_kind, |
HValue* from, |
- HValue* to); |
+ HValue* to, |
+ BailoutId ast_id); |
void BuildCopyElements(HValue* context, |
HValue* from_elements, |
@@ -1094,7 +1094,8 @@ class HGraphBuilder { |
HValue* to_elements, |
ElementsKind to_elements_kind, |
HValue* length, |
- HValue* capacity); |
+ HValue* capacity, |
+ BailoutId ast_id); |
HValue* BuildCloneShallowArray(HContext* context, |
HValue* boilerplate, |