From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Wed, 20 May 2015 09:56:07 +0000
Subject: webkitgtk-2.4.9

---
 Source/JavaScriptCore/dfg/DFGClobberSet.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'Source/JavaScriptCore/dfg/DFGClobberSet.cpp')

diff --git a/Source/JavaScriptCore/dfg/DFGClobberSet.cpp b/Source/JavaScriptCore/dfg/DFGClobberSet.cpp
index d4630e370..791314172 100644
--- a/Source/JavaScriptCore/dfg/DFGClobberSet.cpp
+++ b/Source/JavaScriptCore/dfg/DFGClobberSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
 #if ENABLE(DFG_JIT)
 
 #include "DFGClobberize.h"
-#include "JSCInlines.h"
+#include "Operations.h"
 #include <wtf/ListDump.h>
 
 namespace JSC { namespace DFG {
@@ -122,38 +122,37 @@ HashSet<AbstractHeap> ClobberSet::setOf(bool direct) const
 void addReads(Graph& graph, Node* node, ClobberSet& readSet)
 {
     ClobberSetAdd addRead(readSet);
-    NoOpClobberize noOp;
-    clobberize(graph, node, addRead, noOp, noOp);
+    NoOpClobberize addWrite;
+    clobberize(graph, node, addRead, addWrite);
 }
 
 void addWrites(Graph& graph, Node* node, ClobberSet& writeSet)
 {
-    NoOpClobberize noOp;
+    NoOpClobberize addRead;
     ClobberSetAdd addWrite(writeSet);
-    clobberize(graph, node, noOp, addWrite, noOp);
+    clobberize(graph, node, addRead, addWrite);
 }
 
 void addReadsAndWrites(Graph& graph, Node* node, ClobberSet& readSet, ClobberSet& writeSet)
 {
     ClobberSetAdd addRead(readSet);
     ClobberSetAdd addWrite(writeSet);
-    NoOpClobberize noOp;
-    clobberize(graph, node, addRead, addWrite, noOp);
+    clobberize(graph, node, addRead, addWrite);
 }
 
 bool readsOverlap(Graph& graph, Node* node, ClobberSet& readSet)
 {
     ClobberSetOverlaps addRead(readSet);
-    NoOpClobberize noOp;
-    clobberize(graph, node, addRead, noOp, noOp);
+    NoOpClobberize addWrite;
+    clobberize(graph, node, addRead, addWrite);
     return addRead.result();
 }
 
 bool writesOverlap(Graph& graph, Node* node, ClobberSet& writeSet)
 {
-    NoOpClobberize noOp;
+    NoOpClobberize addRead;
     ClobberSetOverlaps addWrite(writeSet);
-    clobberize(graph, node, noOp, addWrite, noOp);
+    clobberize(graph, node, addRead, addWrite);
     return addWrite.result();
 }
 
-- 
cgit v1.2.1