<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[164456] trunk/Source/JavaScriptCore</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164456">164456</a></dd>

<dt>Author</dt> <dd>fpizlo@apple.com</dd>

<dt>Date</dt> <dd>2014-02-20 16:00:12 -0800 (Thu, 20 Feb 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>FTL may not see a compact_unwind section if there weren't any stackmaps

https://bugs.webkit.org/show_bug.cgi?id=129125

Reviewed by Geoffrey Garen.

It's OK to not have an unwind section, so long as the function also doesn't have any

OSR exits.

* ftl/FTLCompile.cpp:

(JSC::FTL::fixFunctionBasedOnStackMaps):

(JSC::FTL::compile):

* ftl/FTLUnwindInfo.cpp:

(JSC::FTL::UnwindInfo::parse):

* ftl/FTLUnwindInfo.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreftlFTLUnwindInfocpp">trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreftlFTLUnwindInfoh">trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164455 => 164456)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-02-20 23:46:18 UTC (rev 164455)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-02-21 00:00:12 UTC (rev 164456)

</span><span class="lines">@@ -1 +1,18 @@

</span><ins>+2014-02-20  Filip Pizlo  &lt;fpizlo@apple.com&gt;

+

+        FTL may not see a compact_unwind section if there weren't any stackmaps

+        https://bugs.webkit.org/show_bug.cgi?id=129125

+

+        Reviewed by Geoffrey Garen.

+        

+        It's OK to not have an unwind section, so long as the function also doesn't have any

+        OSR exits.

+

+        * ftl/FTLCompile.cpp:

+        (JSC::FTL::fixFunctionBasedOnStackMaps):

+        (JSC::FTL::compile):

+        * ftl/FTLUnwindInfo.cpp:

+        (JSC::FTL::UnwindInfo::parse):

+        * ftl/FTLUnwindInfo.h:

+

</ins><span class="cx"> == Rolled over to ChangeLog-2014-02-20 ==

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (164455 => 164456)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp        2014-02-20 23:46:18 UTC (rev 164455)

+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp        2014-02-21 00:00:12 UTC (rev 164456)

</span><span class="lines">@@ -164,7 +164,7 @@

</span><span class="cx"> 

</span><span class="cx"> static void fixFunctionBasedOnStackMaps(

</span><span class="cx">     State&amp; state, CodeBlock* codeBlock, JITCode* jitCode, GeneratedFunction generatedFunction,

</span><del>-    StackMaps::RecordMap&amp; recordMap)

</del><ins>+    StackMaps::RecordMap&amp; recordMap, bool didSeeUnwindInfo)

</ins><span class="cx"> {

</span><span class="cx">     Graph&amp; graph = state.graph;

</span><span class="cx">     VM&amp; vm = graph.m_vm;

</span><span class="lines">@@ -236,10 +236,13 @@

</span><span class="cx">     ExitThunkGenerator exitThunkGenerator(state);

</span><span class="cx">     exitThunkGenerator.emitThunks();

</span><span class="cx">     if (exitThunkGenerator.didThings()) {

</span><ins>+        RELEASE_ASSERT(state.finalizer-&gt;osrExit.size());

+        RELEASE_ASSERT(didSeeUnwindInfo);

+        

</ins><span class="cx">         OwnPtr&lt;LinkBuffer&gt; linkBuffer = adoptPtr(new LinkBuffer(

</span><span class="cx">             vm, &amp;exitThunkGenerator, codeBlock, JITCompilationMustSucceed));

</span><span class="cx">         

</span><del>-        ASSERT(state.finalizer-&gt;osrExit.size() == state.jitCode-&gt;osrExit.size());

</del><ins>+        RELEASE_ASSERT(state.finalizer-&gt;osrExit.size() == state.jitCode-&gt;osrExit.size());

</ins><span class="cx">         

</span><span class="cx">         for (unsigned i = 0; i &lt; state.jitCode-&gt;osrExit.size(); ++i) {

</span><span class="cx">             OSRExitCompilationInfo&amp; info = state.finalizer-&gt;osrExit[i];

</span><span class="lines">@@ -573,10 +576,15 @@

</span><span class="cx">         }

</span><span class="cx">     }

</span><span class="cx">     

</span><del>-    state.jitCode-&gt;unwindInfo.parse(

</del><ins>+    bool didSeeUnwindInfo = state.jitCode-&gt;unwindInfo.parse(

</ins><span class="cx">         state.compactUnwind, state.compactUnwindSize, state.generatedFunction);

</span><del>-    if (shouldShowDisassembly())

-        dataLog(&quot;Unwind info for &quot;, CodeBlockWithJITType(state.graph.m_codeBlock, JITCode::FTLJIT), &quot;:\n    &quot;, state.jitCode-&gt;unwindInfo, &quot;\n&quot;);

</del><ins>+    if (shouldShowDisassembly()) {

+        dataLog(&quot;Unwind info for &quot;, CodeBlockWithJITType(state.graph.m_codeBlock, JITCode::FTLJIT), &quot;:\n&quot;);

+        if (didSeeUnwindInfo)

+            dataLog(&quot;    &quot;, state.jitCode-&gt;unwindInfo, &quot;\n&quot;);

+        else

+            dataLog(&quot;    &lt;no unwind info&gt;\n&quot;);

+    }

</ins><span class="cx">     

</span><span class="cx">     if (state.stackmapsSection &amp;&amp; state.stackmapsSection-&gt;size()) {

</span><span class="cx">         if (shouldShowDisassembly()) {

</span><span class="lines">@@ -599,7 +607,7 @@

</span><span class="cx">         StackMaps::RecordMap recordMap = state.jitCode-&gt;stackmaps.computeRecordMap();

</span><span class="cx">         fixFunctionBasedOnStackMaps(

</span><span class="cx">             state, state.graph.m_codeBlock, state.jitCode.get(), state.generatedFunction,

</span><del>-            recordMap);

</del><ins>+            recordMap, didSeeUnwindInfo);

</ins><span class="cx">         

</span><span class="cx">         if (shouldShowDisassembly()) {

</span><span class="cx">             for (unsigned i = 0; i &lt; state.jitCode-&gt;handles().size(); ++i) {

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreftlFTLUnwindInfocpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp (164455 => 164456)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp        2014-02-20 23:46:18 UTC (rev 164455)

+++ trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp        2014-02-21 00:00:12 UTC (rev 164456)

</span><span class="lines">@@ -48,11 +48,14 @@

</span><span class="cx"> 

</span><span class="cx"> } // anonymous namespace

</span><span class="cx"> 

</span><del>-void UnwindInfo::parse(void* section, size_t size, GeneratedFunction generatedFunction)

</del><ins>+bool UnwindInfo::parse(void* section, size_t size, GeneratedFunction generatedFunction)

</ins><span class="cx"> {

</span><span class="cx">     m_registers.clear();

</span><span class="cx">     

</span><del>-    RELEASE_ASSERT(section);

</del><ins>+    RELEASE_ASSERT(!!section == !!size);

+    if (!section)

+        return false;

+    

</ins><span class="cx">     RELEASE_ASSERT(size &gt;= sizeof(CompactUnwind));

</span><span class="cx">     

</span><span class="cx">     CompactUnwind* data = bitwise_cast&lt;CompactUnwind*&gt;(section);

</span><span class="lines">@@ -156,6 +159,7 @@

</span><span class="cx"> #endif

</span><span class="cx">     

</span><span class="cx">     std::sort(m_registers.begin(), m_registers.end());

</span><ins>+    return true;

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void UnwindInfo::dump(PrintStream&amp; out) const

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreftlFTLUnwindInfoh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.h (164455 => 164456)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.h        2014-02-20 23:46:18 UTC (rev 164455)

+++ trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.h        2014-02-21 00:00:12 UTC (rev 164456)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -37,7 +37,7 @@

</span><span class="cx">     UnwindInfo();

</span><span class="cx">     ~UnwindInfo();

</span><span class="cx">     

</span><del>-    void parse(void*, size_t, GeneratedFunction);

</del><ins>+    bool parse(void*, size_t, GeneratedFunction);

</ins><span class="cx">     

</span><span class="cx">     void dump(PrintStream&amp;) const;

</span><span class="cx">     

</span></span></pre>

</div>

</div>

</body>

</html>