Reviewers: Benedikt Meurer,
Message:
Committed patchset #1 (id:1) manually as 24727 (tree was closed).
Description:
[turbofan] fix build after r24726
[email protected]
BUG=
Committed: https://code.google.com/p/v8/source/detail?r=24727
Please review this at https://codereview.chromium.org/669643002/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+4, -4 lines):
M src/compiler/instruction.h
M src/compiler/instruction.cc
Index: src/compiler/instruction.cc
diff --git a/src/compiler/instruction.cc b/src/compiler/instruction.cc
index
891a1e789ee91198b64f0bc539ba8f01ef2646e6..4efa6e8e50b3d79740b8f5acd421e29f418c40e4
100644
--- a/src/compiler/instruction.cc
+++ b/src/compiler/instruction.cc
@@ -382,7 +382,7 @@ static void InitializeInstructionBlocks(Zone* zone,
const Schedule* schedule,
InstructionSequence::InstructionSequence(Linkage* linkage, const Graph*
graph,
const Schedule* schedule)
- : zone_(graph->zone()->isolate()),
+ : zone_(schedule->zone()),
node_count_(graph->NodeCount()),
node_map_(zone()->NewArray<int>(node_count_)),
instruction_blocks_(static_cast<int>(schedule->rpo_order()->size()),
NULL,
Index: src/compiler/instruction.h
diff --git a/src/compiler/instruction.h b/src/compiler/instruction.h
index
de73ed2f852a1206bebeec9c6a16cd8d0fecbc72..c3e83fa44c5d03aaa3d07a81daea863f74edffed
100644
--- a/src/compiler/instruction.h
+++ b/src/compiler/instruction.h
@@ -905,10 +905,10 @@ class InstructionSequence FINAL {
}
Frame* frame() { return &frame_; }
- Isolate* isolate() { return zone()->isolate(); }
+ Isolate* isolate() const { return zone()->isolate(); }
Linkage* linkage() const { return linkage_; }
const PointerMapDeque* pointer_maps() const { return &pointer_maps_; }
- Zone* zone() { return &zone_; }
+ Zone* zone() const { return zone_; }
// Used by the instruction selector while adding instructions.
int AddInstruction(Instruction* instr);
@@ -962,7 +962,7 @@ class InstructionSequence FINAL {
typedef std::set<int, std::less<int>, ZoneIntAllocator>
VirtualRegisterSet;
- Zone zone_;
+ Zone* zone_;
int node_count_;
int* node_map_;
InstructionBlocks instruction_blocks_;
--
--
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.
