<!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>[167317] tags/Safari-538.26.6/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/167317">167317</a></dd>

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

<dt>Date</dt> <dd>2014-04-15 10:54:22 -0700 (Tue, 15 Apr 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/166948">r166948</a>.  </pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#tagsSafari538266SourceJavaScriptCoreChangeLog">tags/Safari-538.26.6/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#tagsSafari538266SourceJavaScriptCoredfgDFGPlancpp">tags/Safari-538.26.6/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>

<li><a href="#tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMcpp">tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.cpp</a></li>

<li><a href="#tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMh">tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.h</a></li>

<li><a href="#tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMPOSIXcpp">tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="tagsSafari538266SourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.26.6/Source/JavaScriptCore/ChangeLog (167316 => 167317)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.26.6/Source/JavaScriptCore/ChangeLog        2014-04-15 17:53:23 UTC (rev 167316)

+++ tags/Safari-538.26.6/Source/JavaScriptCore/ChangeLog        2014-04-15 17:54:22 UTC (rev 167317)

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

</span><ins>+2014-04-15  Lucas Forschler  &lt;lforschler@apple.com&gt;

+

+        Merge r166948

+

+    2014-04-08  Filip Pizlo  &lt;fpizlo@apple.com&gt;

+

+            Fail silently if the LLVM dylib isn't found

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

+

+            Reviewed by Mark Hahnenberg.

+

+            * dfg/DFGPlan.cpp:

+            (JSC::DFG::Plan::compileInThreadImpl):

+            * llvm/InitializeLLVM.cpp:

+            (JSC::initializeLLVM):

+            * llvm/InitializeLLVM.h:

+            * llvm/InitializeLLVMPOSIX.cpp:

+            (JSC::initializeLLVMPOSIX):

+

</ins><span class="cx"> 2014-03-31  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

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

</span><span class="cx">         Rollout r166415.

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

<a id="tagsSafari538266SourceJavaScriptCoredfgDFGPlancpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.26.6/Source/JavaScriptCore/dfg/DFGPlan.cpp (167316 => 167317)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.26.6/Source/JavaScriptCore/dfg/DFGPlan.cpp        2014-04-15 17:53:23 UTC (rev 167316)

+++ tags/Safari-538.26.6/Source/JavaScriptCore/dfg/DFGPlan.cpp        2014-04-15 17:54:22 UTC (rev 167317)

</span><span class="lines">@@ -321,10 +321,16 @@

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

</span><span class="cx">         dumpAndVerifyGraph(dfg, &quot;Graph just before FTL lowering:&quot;);

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

</span><ins>+        bool haveLLVM;

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

</span><span class="cx">             GraphSafepoint safepoint(dfg);

</span><del>-            initializeLLVM();

</del><ins>+            haveLLVM = initializeLLVM();

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

</span><ins>+        

+        if (!haveLLVM) {

+            finalizer = adoptPtr(new FailedFinalizer(*this));

+            return FailPath;

+        }

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

</span><span class="cx">         FTL::State state(dfg);

</span><span class="cx">         FTL::lowerDFGToLLVM(state);

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

<a id="tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMcpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.cpp (167316 => 167317)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.cpp        2014-04-15 17:53:23 UTC (rev 167316)

+++ tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.cpp        2014-04-15 17:54:22 UTC (rev 167317)

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

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

</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.

</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">@@ -35,9 +35,10 @@

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

</span><span class="cx"> static pthread_once_t initializeLLVMOnceKey = PTHREAD_ONCE_INIT;

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

</span><del>-void initializeLLVM()

</del><ins>+bool initializeLLVM()

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

</span><span class="cx">     pthread_once(&amp;initializeLLVMOnceKey, initializeLLVMImpl);

</span><ins>+    return !!llvm;

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

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

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

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

<a id="tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMh"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.h (167316 => 167317)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.h        2014-04-15 17:53:23 UTC (rev 167316)

+++ tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVM.h        2014-04-15 17:54:22 UTC (rev 167317)

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

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

</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.

</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">@@ -32,7 +32,9 @@

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

</span><span class="cx"> void initializeLLVMImpl();

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

</span><del>-void initializeLLVM(); // It's safe to call this multiple times.

</del><ins>+// You msut call this before using JSC::llvm. It's safe to call this multiple times.

+// Returns true if we successfully loaded LLVM. Returns false if we didn't.

+bool initializeLLVM();

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

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

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

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

<a id="tagsSafari538266SourceJavaScriptCorellvmInitializeLLVMPOSIXcpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp (167316 => 167317)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp        2014-04-15 17:53:23 UTC (rev 167316)

+++ tags/Safari-538.26.6/Source/JavaScriptCore/llvm/InitializeLLVMPOSIX.cpp        2014-04-15 17:54:22 UTC (rev 167317)

</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">@@ -29,7 +29,9 @@

</span><span class="cx"> #if HAVE(LLVM)

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

</span><span class="cx"> #include &quot;LLVMAPI.h&quot;

</span><ins>+#include &quot;Options.h&quot;

</ins><span class="cx"> #include &lt;dlfcn.h&gt;

</span><ins>+#include &lt;wtf/DataLog.h&gt;

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

</span><span class="cx"> namespace JSC {

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

</span><span class="lines">@@ -37,14 +39,34 @@

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

</span><span class="cx"> void initializeLLVMPOSIX(const char* libraryName)

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

</span><ins>+    const bool verbose =

+        Options::verboseFTLCompilation()

+        || Options::showFTLDisassembly()

+        || Options::verboseFTLFailure()

+        || Options::verboseCompilation()

+        || Options::showDFGDisassembly()

+        || Options::showDisassembly();

+    

</ins><span class="cx">     void* library = dlopen(libraryName, RTLD_NOW);

</span><del>-    ASSERT_WITH_MESSAGE(library, &quot;%s&quot;, dlerror());

</del><ins>+    if (!library) {

+        if (verbose)

+            dataLog(&quot;Failed to load LLVM library at &quot;, libraryName, &quot;: &quot;, dlerror(), &quot;\n&quot;);

+        return;

+    }

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

</span><ins>+    const char* symbolName = &quot;initializeAndGetJSCLLVMAPI&quot;;

</ins><span class="cx">     InitializerFunction initializer = bitwise_cast&lt;InitializerFunction&gt;(

</span><del>-        dlsym(library, &quot;initializeAndGetJSCLLVMAPI&quot;));

-    ASSERT_WITH_MESSAGE(initializer, &quot;%s&quot;, dlerror());

</del><ins>+        dlsym(library, symbolName));

+    if (!initializer) {

+        if (verbose)

+            dataLog(&quot;Failed to find &quot;, symbolName, &quot; in &quot;, libraryName, &quot;: &quot;, dlerror());

+    }

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

</span><span class="cx">     llvm = initializer(WTFLogAlwaysAndCrash);

</span><ins>+    if (!llvm) {

+        if (verbose)

+            dataLog(&quot;LLVM initilization failed.\n&quot;);

+    }

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

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

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

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

</div>

</div>

</body>

</html>