webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 13 insertions, 23 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp b/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp
index 366fbeceb..396ca6119 100644
--- a/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp
+++ b/Source/JavaScriptCore/dfg/DFGNodeFlags.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 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
@@ -28,7 +28,6 @@
 
 #if ENABLE(DFG_JIT)
 
-#include "JSCInlines.h"
 #include <wtf/CommaPrinter.h>
 #include <wtf/StringPrintStream.h>
 
@@ -47,15 +46,9 @@ void dumpNodeFlags(PrintStream& actualOut, NodeFlags flags)
         case NodeResultNumber:
             out.print(comma, "Number");
             break;
-        case NodeResultDouble:
-            out.print(comma, "Double");
-            break;
         case NodeResultInt32:
             out.print(comma, "Int32");
             break;
-        case NodeResultInt52:
-            out.print(comma, "Int52");
-            break;
         case NodeResultBoolean:
             out.print(comma, "Boolean");
             break;
@@ -74,6 +67,12 @@ void dumpNodeFlags(PrintStream& actualOut, NodeFlags flags)
     if (flags & NodeHasVarArgs)
         out.print(comma, "VarArgs");
     
+    if (flags & NodeClobbersWorld)
+        out.print(comma, "Clobbers");
+    
+    if (flags & NodeMightClobber)
+        out.print(comma, "MightClobber");
+    
     if (flags & NodeResultMask) {
         if (!(flags & NodeBytecodeUsesAsNumber) && !(flags & NodeBytecodeNeedsNegZero))
             out.print(comma, "PureInt");
@@ -85,26 +84,17 @@ void dumpNodeFlags(PrintStream& actualOut, NodeFlags flags)
             out.print(comma, "UseAsOther");
     }
     
-    if (flags & NodeMayOverflowInBaseline)
-        out.print(comma, "MayOverflowInBaseline");
+    if (flags & NodeMayOverflow)
+        out.print(comma, "MayOverflow");
     
-    if (flags & NodeMayOverflowInDFG)
-        out.print(comma, "MayOverflowInDFG");
-    
-    if (flags & NodeMayNegZeroInBaseline)
-        out.print(comma, "MayNegZeroInBaseline");
-    
-    if (flags & NodeMayNegZeroInDFG)
-        out.print(comma, "MayNegZeroInDFG");
+    if (flags & NodeMayNegZero)
+        out.print(comma, "MayNegZero");
     
     if (flags & NodeBytecodeUsesAsInt)
         out.print(comma, "UseAsInt");
-
-    if (flags & NodeBytecodeUsesAsArrayIndex)
-        out.print(comma, "ReallyWantsInt");
     
-    if (flags & NodeIsFlushed)
-        out.print(comma, "IsFlushed");
+    if (!(flags & NodeDoesNotExit))
+        out.print(comma, "CanExit");
     
     CString string = out.toCString();
     if (!string.length())