webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 20 insertions, 25 deletions

diff --git a/Source/JavaScriptCore/bytecode/ExitKind.cpp b/Source/JavaScriptCore/bytecode/ExitKind.cpp
index 84ff57b59..350aa5857 100644
--- a/Source/JavaScriptCore/bytecode/ExitKind.cpp
+++ b/Source/JavaScriptCore/bytecode/ExitKind.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013, 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
@@ -38,20 +38,20 @@ const char* exitKindToString(ExitKind kind)
         return "Unset";
     case BadType:
         return "BadType";
-    case BadCell:
-        return "BadCell";
-    case BadIdent:
-        return "BadIdent";
+    case BadFunction:
+        return "BadFunction";
     case BadExecutable:
         return "BadExecutable";
     case BadCache:
         return "BadCache";
-    case BadConstantCache:
-        return "BadConstantCache";
+    case BadCacheWatchpoint:
+        return "BadCacheWatchpoint";
+    case BadWeakConstantCache:
+        return "BadWeakConstantCache";
+    case BadWeakConstantCacheWatchpoint:
+        return "BadWeakConstantCacheWatchpoint";
     case BadIndexingType:
         return "BadIndexingType";
-    case BadTypeInfoFlags:
-        return "BadTypeInfoFlags";
     case Overflow:
         return "Overflow";
     case NegativeZero:
@@ -68,43 +68,38 @@ const char* exitKindToString(ExitKind kind)
         return "InadequateCoverage";
     case ArgumentsEscaped:
         return "ArgumentsEscaped";
-    case ExoticObjectMode:
-        return "ExoticObjectMode";
     case NotStringObject:
         return "NotStringObject";
-    case VarargsOverflow:
-        return "VarargsOverflow";
-    case TDZFailure:
-        return "TDZFailure";
     case Uncountable:
         return "Uncountable";
+    case UncountableWatchpoint:
+        return "UncountableWatchpoint";
     case UncountableInvalidation:
         return "UncountableInvalidation";
     case WatchdogTimerFired:
         return "WatchdogTimerFired";
     case DebuggerEvent:
         return "DebuggerEvent";
-    case ExceptionCheck:
-        return "ExceptionCheck";
-    case GenericUnwind:
-        return "GenericUnwind";
     }
     RELEASE_ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
-bool exitKindMayJettison(ExitKind kind)
+bool exitKindIsCountable(ExitKind kind)
 {
     switch (kind) {
-    case ExceptionCheck:
-    case GenericUnwind:
+    case ExitKindUnset:
+        RELEASE_ASSERT_NOT_REACHED();
+    case BadType:
+    case Uncountable:
+    case UncountableWatchpoint:
+    case LoadFromHole: // Already counted directly by the baseline JIT.
+    case StoreToHole: // Already counted directly by the baseline JIT.
+    case OutOfBounds: // Already counted directly by the baseline JIT.
         return false;
     default:
         return true;
     }
-
-    RELEASE_ASSERT_NOT_REACHED();
-    return false;
 }
 
 } // namespace JSC