webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 8 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGBranchDirection.h b/Source/JavaScriptCore/dfg/DFGBranchDirection.h
index 8bbe3c635..f904a6bd7 100644
--- a/Source/JavaScriptCore/dfg/DFGBranchDirection.h
+++ b/Source/JavaScriptCore/dfg/DFGBranchDirection.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
@@ -23,10 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef DFGBranchDirection_h
-#define DFGBranchDirection_h
-
-#include <wtf/Platform.h>
+#pragma once
 
 #if ENABLE(DFG_JIT)
 
@@ -52,7 +49,7 @@ static inline const char* branchDirectionToString(BranchDirection branchDirectio
 {
     switch (branchDirection) {
     case InvalidBranchDirection:
-        return "Invalid";
+        return "InvalidBranchDirection";
     case TakeTrue:
         return "TakeTrue";
     case TakeFalse:
@@ -60,6 +57,9 @@ static inline const char* branchDirectionToString(BranchDirection branchDirectio
     case TakeBoth:
         return "TakeBoth";
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return "InvalidBranchDirection";
 }
     
 static inline bool isKnownDirection(BranchDirection branchDirection)
@@ -83,6 +83,13 @@ static inline bool branchCondition(BranchDirection branchDirection)
 
 } } // namespace JSC::DFG
 
-#endif // ENABLE(DFG_JIT)
+namespace WTF {
+
+inline void printInternal(PrintStream& out, JSC::DFG::BranchDirection direction)
+{
+    out.print(JSC::DFG::branchDirectionToString(direction));
+}
 
-#endif // DFGBranchDirection_h
+} // namespace WTF
+
+#endif // ENABLE(DFG_JIT)