Unreviewed, fix VS build. I didn't know we still did that, but apparently there's...

for that.

* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 8654f88..282ba0c 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,13 @@
 2016-02-18  Filip Pizlo  <fpizlo@apple.com>
 
+        Unreviewed, fix VS build. I didn't know we still did that, but apparently there's a bot
+        for that.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+
+2016-02-18  Filip Pizlo  <fpizlo@apple.com>
+
         Unreviewed, fix CMake build. This got messed up when rebasing.
 
         * CMakeLists.txt:

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
index 8556fb3..4e3d283 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
@@ -515,7 +515,6 @@
     <ClCompile Include="..\dfg\DFGWatchpointCollectionPhase.cpp" />
     <ClCompile Include="..\dfg\DFGWorklist.cpp" />
     <ClCompile Include="..\disassembler\Disassembler.cpp" />
-    <ClCompile Include="..\disassembler\LLVMDisassembler.cpp" />
     <ClCompile Include="..\disassembler\X86Disassembler.cpp" />
     <ClCompile Include="..\ftl\FTLAbstractHeap.cpp" />
     <ClCompile Include="..\ftl\FTLAbstractHeapRepository.cpp" />
@@ -547,7 +546,7 @@
     <ClCompile Include="..\ftl\FTLLazySlowPath.cpp" />
     <ClCompile Include="..\ftl\FTLLink.cpp" />
     <ClCompile Include="..\ftl\FTLLocation.cpp" />
-    <ClCompile Include="..\ftl\FTLLowerDFGToLLVM.cpp" />
+    <ClCompile Include="..\ftl\FTLLowerDFGToB3.cpp" />
     <ClCompile Include="..\ftl\FTLOSREntry.cpp" />
     <ClCompile Include="..\ftl\FTLOSRExit.cpp" />
     <ClCompile Include="..\ftl\FTLOSRExitCompiler.cpp" />
@@ -688,9 +687,6 @@
     <ClCompile Include="..\llint\LLIntSlowPaths.cpp" />
     <ClCompile Include="..\llint\LLIntThunks.cpp" />
     <ClCompile Include="..\llint\LowLevelInterpreter.cpp" />
-    <ClCompile Include="..\llvm\InitializeLLVM.cpp" />
-    <ClCompile Include="..\llvm\InitializeLLVMWin.cpp" />
-    <ClCompile Include="..\llvm\LLVMAPI.cpp" />
     <ClCompile Include="..\parser\Lexer.cpp" />
     <ClCompile Include="..\parser\ModuleAnalyzer.cpp" />
     <ClCompile Include="..\parser\Nodes.cpp" />
@@ -1299,7 +1295,6 @@
     <ClInclude Include="..\dfg\DFGWatchpointCollectionPhase.h" />
     <ClInclude Include="..\dfg\DFGWorklist.h" />
     <ClInclude Include="..\disassembler\Disassembler.h" />
-    <ClInclude Include="..\disassembler\LLVMDisassembler.h" />
     <ClInclude Include="..\ftl\FTLAbbreviatedTypes.h" />
     <ClInclude Include="..\ftl\FTLAbbreviations.h" />
     <ClInclude Include="..\ftl\FTLAbstractHeap.h" />
@@ -1337,7 +1332,7 @@
     <ClInclude Include="..\ftl\FTLLazySlowPathCall.h" />
     <ClInclude Include="..\ftl\FTLLink.h" />
     <ClInclude Include="..\ftl\FTLLocation.h" />
-    <ClInclude Include="..\ftl\FTLLowerDFGToLLVM.h" />
+    <ClInclude Include="..\ftl\FTLLowerDFGToB3.h" />
     <ClInclude Include="..\ftl\FTLLoweredNodeValue.h" />
     <ClInclude Include="..\ftl\FTLOSREntry.h" />
     <ClInclude Include="..\ftl\FTLOSRExit.h" />
@@ -1530,10 +1525,6 @@
     <ClInclude Include="..\llint\LLIntSlowPaths.h" />
     <ClInclude Include="..\llint\LLIntThunks.h" />
     <ClInclude Include="..\llint\LowLevelInterpreter.h" />
-    <ClInclude Include="..\llvm\InitializeLLVM.h" />
-    <ClInclude Include="..\llvm\LLVMAPI.h" />
-    <ClInclude Include="..\llvm\LLVMAPIFunctions.h" />
-    <ClInclude Include="..\llvm\LLVMHeaders.h" />
     <ClInclude Include="..\parser\ASTBuilder.h" />
     <ClInclude Include="..\parser\Lexer.h" />
     <ClInclude Include="..\parser\ModuleAnalyzer.h" />
@@ -1880,7 +1871,7 @@
     <ClInclude Include="..\wasm\WASMConstants.h" />
     <ClInclude Include="..\wasm\WASMFormat.h" />
     <ClInclude Include="..\wasm\WASMFunctionCompiler.h" />
-    <ClInclude Include="..\wasm\WASMFunctionLLVMIRGenerator.h" />
+    <ClInclude Include="..\wasm\WASMFunctionB3IRGenerator.h" />
     <ClInclude Include="..\wasm\WASMFunctionParser.h" />
     <ClInclude Include="..\wasm\WASMFunctionSyntaxChecker.h" />
     <ClInclude Include="..\wasm\WASMModuleParser.h" />

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
index 7023bc8..c638c4a 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
@@ -1659,7 +1659,7 @@
     <ClCompile Include="..\ftl\FTLLocation.cpp">
       <Filter>ftl</Filter>
     </ClCompile>
-    <ClCompile Include="..\ftl\FTLLowerDFGToLLVM.cpp">
+    <ClCompile Include="..\ftl\FTLLowerDFGToB3.cpp">
       <Filter>ftl</Filter>
     </ClCompile>
     <ClCompile Include="..\ftl\FTLOSREntry.cpp">
@@ -1707,18 +1707,6 @@
     <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>
     <ClCompile Include="..\inspector\ConsoleMessage.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
@@ -4299,7 +4287,7 @@
     <ClInclude Include="..\ftl\FTLLocation.h">
       <Filter>ftl</Filter>
     </ClInclude>
-    <ClInclude Include="..\ftl\FTLLowerDFGToLLVM.h">
+    <ClInclude Include="..\ftl\FTLLowerDFGToB3.h">
       <Filter>ftl</Filter>
     </ClInclude>
     <ClInclude Include="..\ftl\FTLLoweredNodeValue.h">
@@ -4365,21 +4353,6 @@
     <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>
     <ClInclude Include="..\assembler\AbortReason.h">
       <Filter>assembler</Filter>
     </ClInclude>
@@ -4652,7 +4625,7 @@
     <ClInclude Include="..\wasm\WASMFunctionCompiler.h">
       <Filter>wasm</Filter>
     </ClInclude>
-    <ClInclude Include="..\wasm\WASMFunctionLLVMIRGenerator.h">
+    <ClInclude Include="..\wasm\WASMFunctionB3IRGenerator.h">
       <Filter>wasm</Filter>
     </ClInclude>
     <ClInclude Include="..\wasm\WASMFunctionParser.h">