Upgrade V8 to version 4.9.385.28
https://chromium.googlesource.com/v8/v8/+/4.9.385.28
FPIIM-449
Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4
diff --git a/src/compiler/js-inlining.h b/src/compiler/js-inlining.h
index eef29d6..99eff96 100644
--- a/src/compiler/js-inlining.h
+++ b/src/compiler/js-inlining.h
@@ -6,37 +6,51 @@
#define V8_COMPILER_JS_INLINING_H_
#include "src/compiler/js-graph.h"
-#include "src/v8.h"
+#include "src/compiler/graph-reducer.h"
namespace v8 {
namespace internal {
+
+// Forward declarations.
+class CompilationInfo;
+
namespace compiler {
-class JSCallFunctionAccessor;
-
-class JSInliner {
+// The JSInliner provides the core graph inlining machinery. Note that this
+// class only deals with the mechanics of how to inline one graph into another,
+// heuristics that decide what and how much to inline are beyond its scope.
+class JSInliner final : public AdvancedReducer {
public:
- JSInliner(Zone* local_zone, CompilationInfo* info, JSGraph* jsgraph)
- : local_zone_(local_zone), info_(info), jsgraph_(jsgraph) {}
+ JSInliner(Editor* editor, Zone* local_zone, CompilationInfo* info,
+ JSGraph* jsgraph)
+ : AdvancedReducer(editor),
+ local_zone_(local_zone),
+ info_(info),
+ jsgraph_(jsgraph) {}
- void Inline();
- void TryInlineJSCall(Node* node);
- void TryInlineRuntimeCall(Node* node);
+ // Reducer interface, eagerly inlines everything.
+ Reduction Reduce(Node* node) final;
+
+ // Can be used by inlining heuristics or by testing code directly, without
+ // using the above generic reducer interface of the inlining machinery.
+ Reduction ReduceJSCall(Node* node, Handle<JSFunction> function);
private:
- friend class InlinerVisitor;
Zone* local_zone_;
CompilationInfo* info_;
JSGraph* jsgraph_;
- Node* CreateArgumentsAdaptorFrameState(JSCallFunctionAccessor* call,
- Handle<JSFunction> jsfunction,
- Zone* temp_zone);
- void AddClosureToFrameState(Node* frame_state, Handle<JSFunction> jsfunction);
- static void UnifyReturn(Graph* graph);
+ Node* CreateArtificialFrameState(Node* node, Node* outer_frame_state,
+ int parameter_count,
+ FrameStateType frame_state_type,
+ Handle<SharedFunctionInfo> shared);
+
+ Reduction InlineCall(Node* call, Node* new_target, Node* context,
+ Node* frame_state, Node* start, Node* end);
};
-}
-}
-} // namespace v8::internal::compiler
+
+} // namespace compiler
+} // namespace internal
+} // namespace v8
#endif // V8_COMPILER_JS_INLINING_H_