commit f3b273f5e6ffd2f6ba1c18a27a17db41dfb113c3
author Ben Murdoch <benm@google.com> Tue Jan 17 12:11:28 2017 +0000
committer Ben Murdoch <benm@google.com> Wed Jan 18 14:32:11 2017 +0000
tree e748f964837dfc9e4b961000ddacb2965c629d9f
parent a7e90cde16bf95fddae4a5156268e449da86ee36

Merge V8 5.5.372.32

Test: Manual, built and ran D8

Change-Id: I831a5491f74342c2675bb6fe1e24a2258e493758

src/compiler/js-call-reducer.h

diff --git a/src/compiler/js-call-reducer.h b/src/compiler/js-call-reducer.h
index 8d9700a..0c3835c 100644
--- a/src/compiler/js-call-reducer.h
+++ b/src/compiler/js-call-reducer.h
@@ -20,18 +20,22 @@
 
 // Performs strength reduction on {JSCallConstruct} and {JSCallFunction} nodes,
 // which might allow inlining or other optimizations to be performed afterwards.
-class JSCallReducer final : public Reducer {
+class JSCallReducer final : public AdvancedReducer {
  public:
   // Flags that control the mode of operation.
   enum Flag {
     kNoFlags = 0u,
-    kDeoptimizationEnabled = 1u << 0,
+    kBailoutOnUninitialized = 1u << 0,
+    kDeoptimizationEnabled = 1u << 1
   };
   typedef base::Flags<Flag> Flags;
 
-  JSCallReducer(JSGraph* jsgraph, Flags flags,
+  JSCallReducer(Editor* editor, JSGraph* jsgraph, Flags flags,
                 MaybeHandle<Context> native_context)
-      : jsgraph_(jsgraph), flags_(flags), native_context_(native_context) {}
+      : AdvancedReducer(editor),
+        jsgraph_(jsgraph),
+        flags_(flags),
+        native_context_(native_context) {}
 
   Reduction Reduce(Node* node) final;