Index: src/compiler/fast-accessor-assembler.h |
diff --git a/src/compiler/fast-accessor-assembler.h b/src/compiler/fast-accessor-assembler.h |
index 1cb751d0265c6d3b7a669df2b8368fe9a7d2d6b5..cd7e8742780da50b67621bb97533f47a69080bec 100644 |
--- a/src/compiler/fast-accessor-assembler.h |
+++ b/src/compiler/fast-accessor-assembler.h |
@@ -15,6 +15,8 @@ |
#include "src/base/smart-pointers.h" |
#include "src/handles.h" |
+// For CodeStubAssembler::Label. (We cannot forward-declare inner classes.) |
+#include "src/compiler/code-stub-assembler.h" |
namespace v8 { |
namespace internal { |
@@ -76,20 +78,23 @@ class FastAccessorAssembler { |
private: |
ValueId FromRaw(Node* node); |
- LabelId FromRaw(RawMachineLabel* label); |
+ LabelId FromRaw(CodeStubAssembler::Label* label); |
Node* FromId(ValueId value) const; |
- RawMachineLabel* FromId(LabelId value) const; |
+ CodeStubAssembler::Label* FromId(LabelId value) const; |
+ void Clear(); |
Zone* zone() { return &zone_; } |
+ Isolate* isolate() const { return isolate_; } |
Zone zone_; |
- base::SmartPointer<RawMachineAssembler> assembler_; |
+ Isolate* isolate_; |
+ base::SmartPointer<CodeStubAssembler> assembler_; |
// To prevent exposing the RMA internals to the outside world, we'll map |
// Node + Label pointers integers wrapped in ValueId and LabelId instances. |
// These vectors maintain this mapping. |
std::vector<Node*> nodes_; |
- std::vector<RawMachineLabel*> labels_; |
+ std::vector<CodeStubAssembler::Label*> labels_; |
// Remember the current state for easy error checking. (We prefer to be |
// strict as this class will be exposed at the API.) |