<!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>[170130] trunk/Source</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/170130">170130</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 16:42:57 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add FTL to Windows build.
https://bugs.webkit.org/show_bug.cgi?id=134015
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
Added ftl source files.
* JavaScriptCore.vcxproj/JavaScriptCoreCommon.props:
Added ftl and llvm directories to include path.
* JavaScriptCore.vcxproj/libllvmForJSC: Added.
* JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props: Added.
* JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj: Added.
* JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters: Added.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileArithMinOrMax):
MSVC doesn't like to divide by zero while compiling. Use std::nan instead.
* llvm/InitializeLLVMWin.cpp: Added.
(JSC::initializeLLVMImpl):
Implemented dynamic loading and linking for Windows.
Source/WebKit:
* WebKit.vcxproj/WebKit.sln:
Added libllvmForJSC with a dependency on JavaScriptCoreGenerated, but don't build it yet.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreCommonprops">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitsln">trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/</li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCprops">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCorellvmInitializeLLVMWincpp">trunk/Source/JavaScriptCore/llvm/InitializeLLVMWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-06-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Add FTL to Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=134015
+
+ Reviewed by Filip Pizlo.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ Added ftl source files.
+ * JavaScriptCore.vcxproj/JavaScriptCoreCommon.props:
+ Added ftl and llvm directories to include path.
+ * JavaScriptCore.vcxproj/libllvmForJSC: Added.
+ * JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props: Added.
+ * JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj: Added.
+ * JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters: Added.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileArithMinOrMax):
+ MSVC doesn't like to divide by zero while compiling. Use std::nan instead.
+ * llvm/InitializeLLVMWin.cpp: Added.
+ (JSC::initializeLLVMImpl):
+ Implemented dynamic loading and linking for Windows.
+
+2014-06-18 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Unreviewed build fix after r170107.
</span><span class="cx">
</span><span class="cx"> * dfg/DFGSpeculativeJIT.cpp:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -459,6 +459,46 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGWatchpointCollectionPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGWorklist.cpp" />
</span><span class="cx"> <ClCompile Include="..\disassembler\Disassembler.cpp" />
</span><ins>+ <ClCompile Include="..\disassembler\LLVMDisassembler.cpp" />
+ <ClCompile Include="..\disassembler\X86Disassembler.cpp" />
+ <ClCompile Include="..\ftl\FTLAbstractHeap.cpp" />
+ <ClCompile Include="..\ftl\FTLAbstractHeapRepository.cpp" />
+ <ClCompile Include="..\ftl\FTLAvailableRecovery.cpp" />
+ <ClCompile Include="..\ftl\FTLCapabilities.cpp" />
+ <ClCompile Include="..\ftl\FTLCommonValues.cpp" />
+ <ClCompile Include="..\ftl\FTLCompile.cpp" />
+ <ClCompile Include="..\ftl\FTLDataSection.cpp" />
+ <ClCompile Include="..\ftl\FTLDWARFDebugLineInfo.cpp" />
+ <ClCompile Include="..\ftl\FTLDWARFRegister.cpp" />
+ <ClCompile Include="..\ftl\FTLExitArgument.cpp" />
+ <ClCompile Include="..\ftl\FTLExitArgumentForOperand.cpp" />
+ <ClCompile Include="..\ftl\FTLExitThunkGenerator.cpp" />
+ <ClCompile Include="..\ftl\FTLExitValue.cpp" />
+ <ClCompile Include="..\ftl\FTLFail.cpp" />
+ <ClCompile Include="..\ftl\FTLForOSREntryJITCode.cpp" />
+ <ClCompile Include="..\ftl\FTLInlineCacheSize.cpp" />
+ <ClCompile Include="..\ftl\FTLIntrinsicRepository.cpp" />
+ <ClCompile Include="..\ftl\FTLJITCode.cpp" />
+ <ClCompile Include="..\ftl\FTLJITFinalizer.cpp" />
+ <ClCompile Include="..\ftl\FTLJSCall.cpp" />
+ <ClCompile Include="..\ftl\FTLLink.cpp" />
+ <ClCompile Include="..\ftl\FTLLocation.cpp" />
+ <ClCompile Include="..\ftl\FTLLowerDFGToLLVM.cpp" />
+ <ClCompile Include="..\ftl\FTLOSREntry.cpp" />
+ <ClCompile Include="..\ftl\FTLOSRExit.cpp" />
+ <ClCompile Include="..\ftl\FTLOSRExitCompiler.cpp" />
+ <ClCompile Include="..\ftl\FTLOutput.cpp" />
+ <ClCompile Include="..\ftl\FTLRecoveryOpcode.cpp" />
+ <ClCompile Include="..\ftl\FTLRegisterAtOffset.cpp" />
+ <ClCompile Include="..\ftl\FTLSaveRestore.cpp" />
+ <ClCompile Include="..\ftl\FTLSlowPathCall.cpp" />
+ <ClCompile Include="..\ftl\FTLSlowPathCallKey.cpp" />
+ <ClCompile Include="..\ftl\FTLStackMaps.cpp" />
+ <ClCompile Include="..\ftl\FTLState.cpp" />
+ <ClCompile Include="..\ftl\FTLThunks.cpp" />
+ <ClCompile Include="..\ftl\FTLUnwindInfo.cpp" />
+ <ClCompile Include="..\ftl\FTLValueFormat.cpp" />
+ <ClCompile Include="..\ftl\FTLValueRange.cpp" />
</ins><span class="cx"> <ClCompile Include="..\heap\BlockAllocator.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\CodeBlockSet.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\ConservativeRoots.cpp" />
</span><span class="lines">@@ -563,6 +603,9 @@
</span><span class="cx"> <ClCompile Include="..\llint\LLIntSlowPaths.cpp" />
</span><span class="cx"> <ClCompile Include="..\llint\LLIntThunks.cpp" />
</span><span class="cx"> <ClCompile Include="..\llint\LowLevelInterpreter.cpp" />
</span><ins>+ <ClCompile Include="..\llvm\InitializeLLVM.cpp" />
+ <ClCompile Include="..\llvm\InitializeLLVMWin.cpp" />
+ <ClCompile Include="..\llvm\LLVMAPI.cpp" />
</ins><span class="cx"> <ClCompile Include="..\parser\Lexer.cpp" />
</span><span class="cx"> <ClCompile Include="..\parser\Nodes.cpp" />
</span><span class="cx"> <ClCompile Include="..\parser\Parser.cpp" />
</span><span class="lines">@@ -1039,6 +1082,58 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGWatchpointCollectionPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGWorklist.h" />
</span><span class="cx"> <ClInclude Include="..\disassembler\Disassembler.h" />
</span><ins>+ <ClInclude Include="..\disassembler\LLVMDisassembler.h" />
+ <ClInclude Include="..\ftl\FTLAbbreviatedTypes.h" />
+ <ClInclude Include="..\ftl\FTLAbbreviations.h" />
+ <ClInclude Include="..\ftl\FTLAbstractHeap.h" />
+ <ClInclude Include="..\ftl\FTLAbstractHeapRepository.h" />
+ <ClInclude Include="..\ftl\FTLAvailableRecovery.h" />
+ <ClInclude Include="..\ftl\FTLCapabilities.h" />
+ <ClInclude Include="..\ftl\FTLCommonValues.h" />
+ <ClInclude Include="..\ftl\FTLCompile.h" />
+ <ClInclude Include="..\ftl\FTLDataSection.h" />
+ <ClInclude Include="..\ftl\FTLDWARFDebugLineInfo.h" />
+ <ClInclude Include="..\ftl\FTLDWARFRegister.h" />
+ <ClInclude Include="..\ftl\FTLExitArgument.h" />
+ <ClInclude Include="..\ftl\FTLExitArgumentForOperand.h" />
+ <ClInclude Include="..\ftl\FTLExitArgumentList.h" />
+ <ClInclude Include="..\ftl\FTLExitThunkGenerator.h" />
+ <ClInclude Include="..\ftl\FTLExitValue.h" />
+ <ClInclude Include="..\ftl\FTLFail.h" />
+ <ClInclude Include="..\ftl\FTLFormattedValue.h" />
+ <ClInclude Include="..\ftl\FTLForOSREntryJITCode.h" />
+ <ClInclude Include="..\ftl\FTLGeneratedFunction.h" />
+ <ClInclude Include="..\ftl\FTLInlineCacheDescriptor.h" />
+ <ClInclude Include="..\ftl\FTLInlineCacheSize.h" />
+ <ClInclude Include="..\ftl\FTLIntrinsicRepository.h" />
+ <ClInclude Include="..\ftl\FTLJITCode.h" />
+ <ClInclude Include="..\ftl\FTLJITFinalizer.h" />
+ <ClInclude Include="..\ftl\FTLJSCall.h" />
+ <ClInclude Include="..\ftl\FTLLink.h" />
+ <ClInclude Include="..\ftl\FTLLocation.h" />
+ <ClInclude Include="..\ftl\FTLLowerDFGToLLVM.h" />
+ <ClInclude Include="..\ftl\FTLLoweredNodeValue.h" />
+ <ClInclude Include="..\ftl\FTLOSREntry.h" />
+ <ClInclude Include="..\ftl\FTLOSRExit.h" />
+ <ClInclude Include="..\ftl\FTLOSRExitCompilationInfo.h" />
+ <ClInclude Include="..\ftl\FTLOSRExitCompiler.h" />
+ <ClInclude Include="..\ftl\FTLOutput.h" />
+ <ClInclude Include="..\ftl\FTLRecoveryOpcode.h" />
+ <ClInclude Include="..\ftl\FTLRegisterAtOffset.h" />
+ <ClInclude Include="..\ftl\FTLSaveRestore.h" />
+ <ClInclude Include="..\ftl\FTLSlowPathCall.h" />
+ <ClInclude Include="..\ftl\FTLSlowPathCallKey.h" />
+ <ClInclude Include="..\ftl\FTLStackMaps.h" />
+ <ClInclude Include="..\ftl\FTLState.h" />
+ <ClInclude Include="..\ftl\FTLSwitchCase.h" />
+ <ClInclude Include="..\ftl\FTLThunks.h" />
+ <ClInclude Include="..\ftl\FTLTypedPointer.h" />
+ <ClInclude Include="..\ftl\FTLUnwindInfo.h" />
+ <ClInclude Include="..\ftl\FTLValueFormat.h" />
+ <ClInclude Include="..\ftl\FTLValueFromBlock.h" />
+ <ClInclude Include="..\ftl\FTLValueRange.h" />
+ <ClInclude Include="..\ftl\FTLWeight.h" />
+ <ClInclude Include="..\ftl\FTLWeightedTarget.h" />
</ins><span class="cx"> <ClInclude Include="..\heap\BlockAllocator.h" />
</span><span class="cx"> <ClInclude Include="..\heap\CodeBlockSet.h" />
</span><span class="cx"> <ClInclude Include="..\heap\ConservativeRoots.h" />
</span><span class="lines">@@ -1199,6 +1294,10 @@
</span><span class="cx"> <ClInclude Include="..\llint\LLIntSlowPaths.h" />
</span><span class="cx"> <ClInclude Include="..\llint\LLIntThunks.h" />
</span><span class="cx"> <ClInclude Include="..\llint\LowLevelInterpreter.h" />
</span><ins>+ <ClInclude Include="..\llvm\InitializeLLVM.h" />
+ <ClInclude Include="..\llvm\LLVMAPI.h" />
+ <ClInclude Include="..\llvm\LLVMAPIFunctions.h" />
+ <ClInclude Include="..\llvm\LLVMHeaders.h" />
</ins><span class="cx"> <ClInclude Include="..\parser\ASTBuilder.h" />
</span><span class="cx"> <ClInclude Include="..\parser\Lexer.h" />
</span><span class="cx"> <ClInclude Include="..\parser\NodeConstructors.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -61,6 +61,12 @@
</span><span class="cx"> <Filter Include="API">
</span><span class="cx"> <UniqueIdentifier>{9ed0bc6e-7372-4795-9651-917c9e05c641}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><ins>+ <Filter Include="ftl">
+ <UniqueIdentifier>{5252adc9-f26a-4f76-a079-f6222b33e4b8}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="llvm">
+ <UniqueIdentifier>{852e9415-245c-4012-aeb8-38ca9efb73b8}</UniqueIdentifier>
+ </Filter>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClCompile Include="..\API\JSBase.cpp">
</span><span class="lines">@@ -1374,6 +1380,135 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\ftl\FTLAbstractHeap.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLAbstractHeapRepository.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLAvailableRecovery.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLCapabilities.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLCommonValues.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLCompile.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLDataSection.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLDWARFDebugLineInfo.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLDWARFRegister.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLExitArgument.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLExitArgumentForOperand.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLExitThunkGenerator.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLExitValue.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLFail.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLForOSREntryJITCode.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLInlineCacheSize.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLIntrinsicRepository.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLJITCode.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLJITFinalizer.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLJSCall.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLLink.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLLocation.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLLowerDFGToLLVM.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLOSREntry.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLOSRExit.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLOSRExitCompiler.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLOutput.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLRecoveryOpcode.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLRegisterAtOffset.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLSaveRestore.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLSlowPathCall.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLSlowPathCallKey.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLStackMaps.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLState.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLThunks.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLUnwindInfo.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLValueFormat.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ftl\FTLValueRange.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\disassembler\X86Disassembler.cpp">
+ <Filter>disassembler</Filter>
+ </ClCompile>
+ <ClCompile Include="..\disassembler\LLVMDisassembler.cpp">
+ <Filter>disassembler</Filter>
+ </ClCompile>
+ <ClCompile Include="..\llvm\InitializeLLVM.cpp">
+ <Filter>llvm</Filter>
+ </ClCompile>
+ <ClCompile Include="..\llvm\InitializeLLVMWin.cpp">
+ <Filter>llvm</Filter>
+ </ClCompile>
+ <ClCompile Include="..\llvm\LLVMAPI.cpp">
+ <Filter>llvm</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">@@ -3400,6 +3535,174 @@
</span><span class="cx"> <ClInclude Include="..\jit\RegisterPreservationWrapperGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ftl\FTLAbbreviatedTypes.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLAbbreviations.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLAbstractHeap.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLAbstractHeapRepository.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLAvailableRecovery.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLCapabilities.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLCommonValues.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLCompile.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLDataSection.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLDWARFDebugLineInfo.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLDWARFRegister.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLExitArgument.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLExitArgumentForOperand.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLExitArgumentList.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLExitThunkGenerator.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLExitValue.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLFail.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLFormattedValue.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLForOSREntryJITCode.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLGeneratedFunction.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLInlineCacheDescriptor.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLInlineCacheSize.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLIntrinsicRepository.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLJITCode.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLJITFinalizer.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLJSCall.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLLink.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLLocation.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLLowerDFGToLLVM.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLLoweredNodeValue.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLOSREntry.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLOSRExit.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLOSRExitCompilationInfo.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLOSRExitCompiler.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLOutput.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLRecoveryOpcode.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLRegisterAtOffset.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLSaveRestore.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLSlowPathCall.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLSlowPathCallKey.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLStackMaps.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLState.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLSwitchCase.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLThunks.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLTypedPointer.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLUnwindInfo.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLValueFormat.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLValueFromBlock.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLValueRange.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLWeight.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ftl\FTLWeightedTarget.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\disassembler\LLVMDisassembler.h">
+ <Filter>disassembler</Filter>
+ </ClInclude>
+ <ClInclude Include="..\llvm\InitializeLLVM.h">
+ <Filter>llvm</Filter>
+ </ClInclude>
+ <ClInclude Include="..\llvm\LLVMAPI.h">
+ <Filter>llvm</Filter>
+ </ClInclude>
+ <ClInclude Include="..\llvm\LLVMAPIFunctions.h">
+ <Filter>llvm</Filter>
+ </ClInclude>
+ <ClInclude Include="..\llvm\LLVMHeaders.h">
+ <Filter>llvm</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="JavaScriptCorePreLink.cmd" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreCommon.props 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\builtins\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;..\ftl\;..\bindings\;..\inspector\;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</del><ins>+ <AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\builtins\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;..\ftl\;..\bindings\;..\inspector\;..\ftl;..\llvm;..\llvm\library;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ins><span class="cx"> <ForcedIncludeFiles>ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCprops"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props (0 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.props 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\;..\..\;..\..\llvm;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib$(PlatformArchitecture)\llvm</AdditionalLibraryDirectories>
+ <AdditionalDependencies>LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMAsmPrinter.lib;LLVMBitReader.lib;LLVMBitWriter.lib;LLVMCodeGen.lib;LLVMCore.lib;LLVMDebugInfo.lib;LLVMExecutionEngine.lib;LLVMInstCombine.lib;LLVMInstrumentation.lib;LLVMInterpreter.lib;LLVMipa.lib;LLVMipo.lib;LLVMIRReader.lib;LLVMJIT.lib;LLVMLinker.lib;LLVMLTO.lib;LLVMMC.lib;LLVMMCDisassembler.lib;LLVMMCJIT.lib;LLVMMCParser.lib;LLVMObjCARCOpts.lib;LLVMObject.lib;LLVMOption.lib;LLVMRuntimeDyld.lib;LLVMScalarOpts.lib;LLVMSelectionDAG.lib;LLVMSupport.lib;LLVMTableGen.lib;LLVMTarget.lib;LLVMTransformUtils.lib;LLVMVectorize.lib;LLVMX86AsmParser.lib;LLVMX86AsmPrinter.lib;LLVMX86CodeGen.lib;LLVMX86Desc.lib;LLVMX86Disassembler.lib;LLVMX86Info.lib;LLVMX86Utils.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxproj"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj (0 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -0,0 +1,157 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug_WinCairo|Win32">
+ <Configuration>Debug_WinCairo</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_WinCairo|x64">
+ <Configuration>Debug_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Production|Win32">
+ <Configuration>Production</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Production|x64">
+ <Configuration>Production</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_WinCairo|Win32">
+ <Configuration>Release_WinCairo</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_WinCairo|x64">
+ <Configuration>Release_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\llvm\library\config_llvm.h" />
+ <ClInclude Include="..\..\llvm\library\LLVMTrapCallback.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\llvm\library\LLVMAnchor.cpp" />
+ <ClCompile Include="..\..\llvm\library\LLVMExports.cpp" />
+ <ClCompile Include="..\..\llvm\library\LLVMOverrides.cpp" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F102C44B-3AD9-445A-9DC2-3D123555E7CC}</ProjectGuid>
+ <RootNamespace>libEGL</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
+ <Import Project="$(WebKit_Libraries)\win\tools\vsprops\common.props" />
+ <Import Project="libllvmForJSC.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxprojfilters"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters (0 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters (rev 0)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj.filters 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClInclude Include="..\..\llvm\library\config_llvm.h" />
+ <ClInclude Include="..\..\llvm\library\LLVMTrapCallback.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\llvm\library\LLVMAnchor.cpp" />
+ <ClCompile Include="..\..\llvm\library\LLVMExports.cpp" />
+ <ClCompile Include="..\..\llvm\library\LLVMOverrides.cpp" />
+ </ItemGroup>
+</Project>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -1436,7 +1436,7 @@
</span><span class="cx"> m_node->op() == ArithMin
</span><span class="cx"> ? m_out.doubleGreaterThanOrEqual(left, right)
</span><span class="cx"> : m_out.doubleLessThanOrEqual(left, right),
</span><del>- right, m_out.constDouble(0.0 / 0.0))));
</del><ins>+ right, m_out.constDouble(PNaN))));
</ins><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmInitializeLLVMWincpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/llvm/InitializeLLVMWin.cpp (0 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/InitializeLLVMWin.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/llvm/InitializeLLVMWin.cpp 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "config.h"
+#include "InitializeLLVM.h"
+
+#include "LLVMAPI.h"
+#include <Windows.h>
+
+#if HAVE(LLVM)
+
+namespace JSC {
+
+typedef LLVMAPI* (*InitializerFunction)(void(*)(const char*, ...));
+
+void initializeLLVMImpl()
+{
+ const wchar_t* libraryName = L"libllvmForJSC.dll";
+
+ HMODULE library = ::LoadLibrary(libraryName);
+
+ if (!library)
+ return;
+
+ const char* symbolName = "initializeAndGetJSCLLVMAPI";
+ InitializerFunction initializer = bitwise_cast<InitializerFunction>(GetProcAddress(library, symbolName));
+ if (initializer)
+ llvm = initializer(WTFLogAlwaysAndCrash);
+}
+
+} // namespace JSC
+
+#endif // HAVE(LLVM)
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/WebKit/ChangeLog 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-18 Alex Christensen <achristensen@webkit.org>
+
+ Add FTL to Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=134015
+
+ Reviewed by Filip Pizlo.
+
+ * WebKit.vcxproj/WebKit.sln:
+ Added libllvmForJSC with a dependency on JavaScriptCoreGenerated, but don't build it yet.
+
</ins><span class="cx"> 2014-06-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitsln"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (170129 => 170130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-06-18 23:16:46 UTC (rev 170129)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-06-18 23:42:57 UTC (rev 170130)
</span><span class="lines">@@ -192,6 +192,11 @@
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><ins>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libllvmForJSC", "..\..\JavaScriptCore\JavaScriptCore.vcxproj\libllvmForJSC\libllvmForJSC.vcxproj", "{F102C44B-3AD9-445A-9DC2-3D123555E7CC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
+ EndProjectSection
+EndProject
</ins><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug_WinCairo|Win32 = Debug_WinCairo|Win32
</span><span class="lines">@@ -1040,6 +1045,18 @@
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|x64
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.Build.0 = Release|x64
</span><ins>+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Debug|x64.ActiveCfg = Debug|x64
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.DebugSuffix|x64.ActiveCfg = Debug|x64
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Production|Win32.ActiveCfg = Production|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Production|x64.ActiveCfg = Production|x64
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release|Win32.ActiveCfg = Release|Win32
+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release|x64.ActiveCfg = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span><span class="lines">@@ -1055,6 +1072,7 @@
</span><span class="cx"> {D595E3F6-24F2-4C60-935C-95D50C6B3E96} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
</span><span class="cx"> {877150A0-41B3-4730-9D98-1B8298098B14} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
</span><span class="cx"> {9221744B-5715-4F56-9590-42F7AB23DD8B} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
</span><ins>+ {F102C44B-3AD9-445A-9DC2-3D123555E7CC} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
</ins><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {4A894588-A951-4E76-A085-50E10304DC40}
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A} = {4A894588-A951-4E76-A085-50E10304DC40}
</span><span class="cx"> {83414B15-1C0D-490B-990E-03F4D49170E4} = {4A894588-A951-4E76-A085-50E10304DC40}
</span></span></pre>
</div>
</div>
</body>
</html>