Index: src/compiler/raw-machine-assembler.h |
diff --git a/src/compiler/raw-machine-assembler.h b/src/compiler/raw-machine-assembler.h |
index 36299440d681ac2550ed7e336741e08b94fe92f4..9722a4eee1b21559cd6986ead9cf824648362a16 100644 |
--- a/src/compiler/raw-machine-assembler.h |
+++ b/src/compiler/raw-machine-assembler.h |
@@ -5,6 +5,7 @@ |
#ifndef V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_ |
#define V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_ |
+#include "src/compiler.h" |
Michael Starzinger
2015/07/17 13:20:59
Do we need this include here? This smells to inclu
rmcilroy
2015/07/21 11:13:21
The reason I did this is that raw_machine_assemble
|
#include "src/compiler/common-operator.h" |
#include "src/compiler/graph-builder.h" |
#include "src/compiler/linkage.h" |
@@ -12,7 +13,6 @@ |
#include "src/compiler/node.h" |
#include "src/compiler/operator.h" |
- |
namespace v8 { |
namespace internal { |
namespace compiler { |
@@ -47,6 +47,7 @@ class RawMachineAssembler : public GraphBuilder { |
MachineType word = kMachPtr, |
MachineOperatorBuilder::Flags flags = |
MachineOperatorBuilder::Flag::kNoFlags); |
+ |
~RawMachineAssembler() override {} |
Zone* zone() const { return graph()->zone(); } |
@@ -493,6 +494,9 @@ class RawMachineAssembler : public GraphBuilder { |
MachineType arg7_type, Node* function, Node* arg0, |
Node* arg1, Node* arg2, Node* arg3, Node* arg4, |
Node* arg5, Node* arg6, Node* arg7); |
+ Node* CallInterpreterHandler(Node* target_handler, |
+ Node* bytecodes, |
+ Node* dispatch_table); |
void Return(Node* value); |
void Bind(Label* label); |
void Deoptimize(Node* state); |
@@ -511,21 +515,22 @@ class RawMachineAssembler : public GraphBuilder { |
// MachineAssembler is invalid after export. |
Schedule* Export(); |
+ Schedule* schedule() { |
+ DCHECK(ScheduleValid()); |
+ return schedule_; |
+ } |
+ |
+ BasicBlock* CurrentBlock(); |
+ |
protected: |
Node* MakeNode(const Operator* op, int input_count, Node** inputs, |
bool incomplete) final; |
bool ScheduleValid() { return schedule_ != NULL; } |
- Schedule* schedule() { |
- DCHECK(ScheduleValid()); |
- return schedule_; |
- } |
- |
private: |
BasicBlock* Use(Label* label); |
BasicBlock* EnsureBlock(Label* label); |
- BasicBlock* CurrentBlock(); |
Schedule* schedule_; |
MachineOperatorBuilder machine_; |