<!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>[179993] trunk</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/179993">179993</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 09:20:07 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] [64-bit] Work around MSVC2013 Runtime Bug
https://bugs.webkit.org/show_bug.cgi?id=141498
<rdar://problem/19803642>
Reviewed by Anders Carlsson.
Disable FMA3 instruction use in the MSVC math library to
work around a VS2013 runtime crash. We can remove this
workaround when we switch to VS2015.
Source/JavaScriptCore:
* API/tests/testapi.c: Call _set_FMA3_enable(0) to disable
FMA3 support.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Add new files.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Ditto.
* JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp: Added.
* JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp: Call _set_FMA3_enable(0)
to disable FMA3 support.
* jsc.cpp: Ditto.
* testRegExp.cpp: Ditto.
Source/WebKit/win:
* WebKitDLL.cpp: Call _set_FMA3_enable(0) to disable FMA3 support.
Source/WTF:
* WTF.vcxproj/WTF.vcxproj: Add new files.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* wtf/win/WTFDLL.cpp: Added.
Tools:
* DumpRenderTree/cg/ImageDiffCG.cpp: Call _set_FMA3_enable(0) to
disable FMA3 support.
* DumpRenderTree/win/DumpRenderTree.cpp: Ditto.
* DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.
* DumpRenderTree/win/TestRunnerWin.cpp: Ditto.
* Scripts/webkitperl/httpd.pm: Ditto.
* TestWebKitAPI/win/main.cpp: Ditto.
* WinLauncher/Common.cpp: Ditto.
* win/DLLLauncher/DLLLauncherMain.cpp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapic">trunk/Source/JavaScriptCore/API/tests/testapi.c</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscDLLLauncherMaincpp">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestRegExpcpp">trunk/Source/JavaScriptCore/testRegExp.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitDLLcpp">trunk/Source/WebKit/win/WebKitDLL.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreecgImageDiffCGcpp">trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinImageDiffCairocpp">trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIwinmaincpp">trunk/Tools/TestWebKitAPI/win/main.cpp</a></li>
<li><a href="#trunkToolsWinLauncherCommoncpp">trunk/Tools/WinLauncher/Common.cpp</a></li>
<li><a href="#trunkToolswinDLLLauncherDLLLauncherMaincpp">trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreDLLcpp">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp</a></li>
<li><a href="#trunkSourceWTFwtfwinWTFDLLcpp">trunk/Source/WTF/wtf/win/WTFDLL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIteststestapic"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.c (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.c 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.c 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2015 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">@@ -1177,6 +1177,15 @@
</span><span class="cx"> int main(int argc, char* argv[])
</span><span class="cx"> {
</span><span class="cx"> #if OS(WINDOWS)
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] [64-bit] Work around MSVC2013 Runtime Bug
+ https://bugs.webkit.org/show_bug.cgi?id=141498
+ <rdar://problem/19803642>
+
+ Reviewed by Anders Carlsson.
+
+ Disable FMA3 instruction use in the MSVC math library to
+ work around a VS2013 runtime crash. We can remove this
+ workaround when we switch to VS2015.
+
+ * API/tests/testapi.c: Call _set_FMA3_enable(0) to disable
+ FMA3 support.
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Add new files.
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Ditto.
+ * JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp: Added.
+ * JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp: Call _set_FMA3_enable(0)
+ to disable FMA3 support.
+ * jsc.cpp: Ditto.
+ * testRegExp.cpp: Ditto.
+
</ins><span class="cx"> 2015-02-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The callee frame helpers in DFG::SpeculativeJIT should be available to other JITs
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -846,6 +846,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontendDispatchers.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolObjects.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
</span><ins>+ <ClCompile Include="JavaScriptCoreDLL.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ArrayConstructor.lut.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1755,6 +1755,10 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\VirtualRegister.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\jit\SetupVarargsFrame.cpp" />
+ <ClCompile Include="JavaScriptCoreDLL.cpp">
+ <Filter>API</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span><span class="lines">@@ -4198,6 +4202,7 @@
</span><span class="cx"> <ClInclude Include="..\jit\PolymorphicCallStubRoutine.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\jit\SetupVarargsFrame.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="JavaScriptCorePreLink.cmd" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreDLLcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp (0 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDLL.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+* Copyright (C) 2015 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <Windows.h>
+#include <math.h>
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+ switch (fdwReason) {
+ case DLL_PROCESS_ATTACH:
+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+ break;
+
+ case DLL_PROCESS_DETACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ break;
+ }
+
+ return TRUE;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscDLLLauncherMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 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">@@ -183,6 +183,15 @@
</span><span class="cx"> int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> enableTerminationOnHeapCorruption();
</span><span class="cx">
</span><span class="cx"> // Get the path of our executable.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012, 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2006 Bjoern Graf (bjoern.graf@gmail.com)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -1169,7 +1169,14 @@
</span><span class="cx"> fesetenv( &env );
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINDOWS)
</del><ins>+#if OS(WINDOWS) && (defined(_M_X64) || defined(__x86_64__))
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/testRegExp.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/testRegExp.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/JavaScriptCore/testRegExp.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -163,6 +163,15 @@
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><span class="cx"> #if OS(WINDOWS)
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/WTF/ChangeLog 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] [64-bit] Work around MSVC2013 Runtime Bug
+ https://bugs.webkit.org/show_bug.cgi?id=141498
+ <rdar://problem/19803642>
+
+ Reviewed by Anders Carlsson.
+
+ Disable FMA3 instruction use in the MSVC math library to
+ work around a VS2013 runtime crash. We can remove this
+ workaround when we switch to VS2015.
+
+ * WTF.vcxproj/WTF.vcxproj: Add new files.
+ * WTF.vcxproj/WTF.vcxproj.filters: Ditto.
+ * wtf/win/WTFDLL.cpp: Added.
+
</ins><span class="cx"> 2015-02-11 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK] Use bmalloc instead of tcmalloc
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -151,6 +151,7 @@
</span><span class="cx"> <ClCompile Include="..\wtf\unicode\UTF8.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\MainThreadWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\RunLoopWin.cpp" />
</span><ins>+ <ClCompile Include="..\wtf\win\WTFDLL.cpp" />
</ins><span class="cx"> <ClCompile Include="..\wtf\WTFThreadData.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\SchedulePairCF.cpp" />
</span><span class="cx"> </ItemGroup>
</span><span class="lines">@@ -775,4 +776,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -252,6 +252,10 @@
</span><span class="cx"> <ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp">
</span><span class="cx"> <Filter>wtf\gobject</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\wtf\RefCounter.cpp" />
+ <ClCompile Include="..\wtf\win\WTFDLL.cpp">
+ <Filter>win</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\wtf\dtoa\utils.h">
</span><span class="lines">@@ -723,6 +727,7 @@
</span><span class="cx"> <ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h">
</span><span class="cx"> <Filter>wtf\gobject</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\wtf\RefCounter.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="WTFPostBuild.cmd" />
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWTFDLLcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/win/WTFDLL.cpp (0 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WTFDLL.cpp (rev 0)
+++ trunk/Source/WTF/wtf/win/WTFDLL.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+* Copyright (C) 2015 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <Windows.h>
+#include <math.h>
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+ switch (fdwReason) {
+ case DLL_PROCESS_ATTACH:
+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+ break;
+
+ case DLL_PROCESS_DETACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ break;
+ }
+
+ return TRUE;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/WebKit/win/ChangeLog 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] [64-bit] Work around MSVC2013 Runtime Bug
+ https://bugs.webkit.org/show_bug.cgi?id=141498
+ <rdar://problem/19803642>
+
+ Reviewed by Anders Carlsson.
+
+ Disable FMA3 instruction use in the MSVC math library to
+ work around a VS2013 runtime crash. We can remove this
+ workaround when we switch to VS2015.
+
+ * WebKitDLL.cpp: Call _set_FMA3_enable(0) to disable FMA3 support.
+
</ins><span class="cx"> 2015-02-11 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Accelerated compositing should be disabled when graphics card does not support it.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitDLLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitDLL.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitDLL.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Source/WebKit/win/WebKitDLL.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014-2015 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">@@ -66,6 +66,14 @@
</span><span class="cx"> {
</span><span class="cx"> switch (ul_reason_for_call) {
</span><span class="cx"> case DLL_PROCESS_ATTACH:
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
</ins><span class="cx"> gLockCount = gClassCount = 0;
</span><span class="cx"> gInstance = hModule;
</span><span class="cx"> WebCore::setInstanceHandle(hModule);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/ChangeLog 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] [64-bit] Work around MSVC2013 Runtime Bug
+ https://bugs.webkit.org/show_bug.cgi?id=141498
+ <rdar://problem/19803642>
+
+ Reviewed by Anders Carlsson.
+
+ Disable FMA3 instruction use in the MSVC math library to
+ work around a VS2013 runtime crash. We can remove this
+ workaround when we switch to VS2015.
+
+ * DumpRenderTree/cg/ImageDiffCG.cpp: Call _set_FMA3_enable(0) to
+ disable FMA3 support.
+ * DumpRenderTree/win/DumpRenderTree.cpp: Ditto.
+ * DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.
+ * DumpRenderTree/win/TestRunnerWin.cpp: Ditto.
+ * Scripts/webkitperl/httpd.pm: Ditto.
+ * TestWebKitAPI/win/main.cpp: Ditto.
+ * WinLauncher/Common.cpp: Ditto.
+ * win/DLLLauncher/DLLLauncherMain.cpp: Ditto.
+
</ins><span class="cx"> 2015-02-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> run-jsc-stress-tests should accept remote host config from JSON file
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgImageDiffCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2005 Ben La Monica <ben.lamonica@gmail.com>. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -172,6 +172,15 @@
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(WIN)
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> _setmode(0, _O_BINARY);
</span><span class="cx"> _setmode(1, _O_BINARY);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005-2015 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">@@ -1390,6 +1390,15 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinImageDiffCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2005 Ben La Monica <ben.lamonica@gmail.com>. All rights reserved.
</span><span class="cx"> * Copyright (C) 2011 Brent Fulgham. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -169,6 +169,15 @@
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(WIN)
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> _setmode(0, _O_BINARY);
</span><span class="cx"> _setmode(1, _O_BINARY);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIwinmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/win/main.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/win/main.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/TestWebKitAPI/win/main.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2011, 2015 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">@@ -41,6 +41,15 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span></span></pre></div>
<a id="trunkToolsWinLauncherCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/Common.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/Common.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/WinLauncher/Common.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2008, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2008, 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2009, 2011 Brent Fulgham. All rights reserved.
</span><span class="cx"> * Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013 Alex Christensen. All rights reserved.
</span><span class="lines">@@ -139,8 +139,17 @@
</span><span class="cx">
</span><span class="cx"> BOOL WINAPI DllMain(HINSTANCE dllInstance, DWORD reason, LPVOID)
</span><span class="cx"> {
</span><del>- if (reason == DLL_PROCESS_ATTACH)
</del><ins>+ if (reason == DLL_PROCESS_ATTACH) {
+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
</ins><span class="cx"> hInst = dllInstance;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolswinDLLLauncherDLLLauncherMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (179992 => 179993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-02-12 17:12:26 UTC (rev 179992)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-02-12 17:20:07 UTC (rev 179993)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 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">@@ -184,6 +184,15 @@
</span><span class="cx"> int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+#if defined(_M_X64) || defined(__x86_64__)
+ // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
+ // if the feature has been disabled in firmware. This causes us to crash
+ // in some of the math functions. For now, we disable those optimizations
+ // because Microsoft is not going to fix the problem in VS2013.
+ // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
+ _set_FMA3_enable(0);
+#endif
+
</ins><span class="cx"> #ifdef _CRTDBG_MAP_ALLOC
</span><span class="cx"> _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
</span><span class="cx"> _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
</span></span></pre>
</div>
</div>
</body>
</html>