Title: [170011] trunk/Source/_javascript_Core
Revision
170011
Author
[email protected]
Date
2014-06-16 09:40:56 -0700 (Mon, 16 Jun 2014)

Log Message

Convert ASSERT in inlineFunctionForCapabilityLevel to early return
https://bugs.webkit.org/show_bug.cgi?id=133903

Reviewed by Mark Hahnenberg.

Hardened code by Converting ASSERT to return CannotCompile.

* dfg/DFGCapabilities.h:
(JSC::DFG::inlineFunctionForCapabilityLevel):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (170010 => 170011)


--- trunk/Source/_javascript_Core/ChangeLog	2014-06-16 16:33:27 UTC (rev 170010)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-06-16 16:40:56 UTC (rev 170011)
@@ -1,3 +1,15 @@
+2014-06-16  Michael Saboff  <[email protected]>
+
+        Convert ASSERT in inlineFunctionForCapabilityLevel to early return
+        https://bugs.webkit.org/show_bug.cgi?id=133903
+
+        Reviewed by Mark Hahnenberg.
+
+        Hardened code by Converting ASSERT to return CannotCompile.
+
+        * dfg/DFGCapabilities.h:
+        (JSC::DFG::inlineFunctionForCapabilityLevel):
+
 2014-06-13  Sam Weinig  <[email protected]>
 
         Store DOM constants directly in the JS object rather than jumping through a custom accessor

Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.h (170010 => 170011)


--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2014-06-16 16:33:27 UTC (rev 170010)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2014-06-16 16:40:56 UTC (rev 170011)
@@ -149,7 +149,8 @@
 inline CapabilityLevel inlineFunctionForCapabilityLevel(CodeBlock* codeBlock, CodeSpecializationKind kind, bool isClosureCall)
 {
     if (isClosureCall) {
-        ASSERT(kind == CodeForCall);
+        if (kind != CodeForCall)
+            return CannotCompile;
         return inlineFunctionForClosureCallCapabilityLevel(codeBlock);
     }
     if (kind == CodeForCall)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to