Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 3 insertions, 7 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGVariableEventStream.h b/Source/JavaScriptCore/dfg/DFGVariableEventStream.h
index cfe8aaa7c..b0e4afac5 100644
--- a/Source/JavaScriptCore/dfg/DFGVariableEventStream.h
+++ b/Source/JavaScriptCore/dfg/DFGVariableEventStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,14 +26,13 @@
 #ifndef DFGVariableEventStream_h
 #define DFGVariableEventStream_h
 
-#include <wtf/Platform.h>
-
 #if ENABLE(DFG_JIT)
 
 #include "DFGCommon.h"
 #include "DFGMinifiedGraph.h"
 #include "DFGVariableEvent.h"
 #include "Operands.h"
+#include "ValueRecovery.h"
 #include <wtf/Vector.h>
 
 namespace JSC { namespace DFG {
@@ -42,9 +41,6 @@ class VariableEventStream : public Vector<VariableEvent> {
 public:
     void appendAndLog(const VariableEvent& event)
     {
-#if DFG_ENABLE(DEBUG_VERBOSE)
-        logEvent(event);
-#endif
         append(event);
     }
     
@@ -53,7 +49,7 @@ public:
         unsigned index, Operands<ValueRecovery>&) const;
 
 private:
-    bool tryToSetConstantRecovery(ValueRecovery&, CodeBlock*, MinifiedNode*) const;
+    bool tryToSetConstantRecovery(ValueRecovery&, MinifiedNode*) const;
     
     void logEvent(const VariableEvent&);
 };