Title: [153159] trunk/Source/_javascript_Core
Revision
153159
Author
[email protected]
Date
2013-07-24 21:00:07 -0700 (Wed, 24 Jul 2013)

Log Message

fourthTier: Segfault in jsc with simple test program when running with profile dumping enabled
https://bugs.webkit.org/show_bug.cgi?id=116082

It's crashing because CodeBlock::baselineVersion() doesn't know how to handle the case where 'this' is the
baseline version but it hasn't been assigned to the m_blahCodeBlock field in BlahExecutable. The fix is to
check if we're the baseline version in baselineVersion() and return this if so.

Reviewed by Filip Pizlo.

* bytecode/CodeBlock.h:
(JSC::CodeBlock::baselineVersion):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (153158 => 153159)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-25 04:00:05 UTC (rev 153158)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-25 04:00:07 UTC (rev 153159)
@@ -1,3 +1,17 @@
+2013-05-14  Mark Hahnenberg  <[email protected]>
+
+        fourthTier: Segfault in jsc with simple test program when running with profile dumping enabled
+        https://bugs.webkit.org/show_bug.cgi?id=116082
+
+        It's crashing because CodeBlock::baselineVersion() doesn't know how to handle the case where 'this' is the 
+        baseline version but it hasn't been assigned to the m_blahCodeBlock field in BlahExecutable. The fix is to 
+        check if we're the baseline version in baselineVersion() and return this if so.
+
+        Reviewed by Filip Pizlo.
+
+        * bytecode/CodeBlock.h:
+        (JSC::CodeBlock::baselineVersion):
+
 2013-05-11  Mark Hahnenberg  <[email protected]>
 
         Rename StructureCheckHoistingPhase to TypeCheckHoistingPhase

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (153158 => 153159)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-07-25 04:00:05 UTC (rev 153158)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-07-25 04:00:07 UTC (rev 153159)
@@ -134,9 +134,10 @@
 #if ENABLE(JIT)
         CodeBlock* baselineVersion()
         {
+            if (JITCode::isBaselineCode(getJITType()))
+                return this;
             CodeBlock* result = replacement();
-            if (!result)
-                return 0; // This can happen if we're in the process of creating the baseline version.
+            ASSERT(result);
             while (result->alternative())
                 result = result->alternative();
             ASSERT(result);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to