diff --git a/Source/JavaScriptCore/API/tests/JSNode.c b/Source/JavaScriptCore/API/tests/JSNode.c index 052c88a0216e469ad9e89128a5e1e85d339c14d2..d9ac0a91303264ce9dedece744a5b9c119e595aa 100644 --- a/Source/JavaScriptCore/API/tests/JSNode.c +++ b/Source/JavaScriptCore/API/tests/JSNode.c @@ -30,7 +30,7 @@ #include "JSValueRef.h" #include "Node.h" #include "NodeList.h" -#include +#include "UnusedParam.h" #include static JSValueRef JSNode_appendChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) diff --git a/Source/JavaScriptCore/API/tests/JSNodeList.c b/Source/JavaScriptCore/API/tests/JSNodeList.c index 0d194845e02de03ce5cbfb5639308bdee75e5d1d..bc4a8ad996d491323f5573533604d5d21f505feb 100644 --- a/Source/JavaScriptCore/API/tests/JSNodeList.c +++ b/Source/JavaScriptCore/API/tests/JSNodeList.c @@ -27,7 +27,7 @@ #include "JSNodeList.h" #include "JSObjectRef.h" #include "JSValueRef.h" -#include +#include "UnusedParam.h" #include static JSValueRef JSNodeList_item(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index d5a9148ee261ffe51b7cbab26b3fbbefebf1e7ac..b37834ddb28ac81311667ccde27ab08a609e1164 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,46 @@ +2012-03-06 Sheriff Bot + + Unreviewed, rolling out r109837. + http://trac.webkit.org/changeset/109837 + https://bugs.webkit.org/show_bug.cgi?id=80399 + + breaks Mac Productions builds, too late to try and fix it + tonight (Requested by eseidel on #webkit). + + * API/tests/JSNode.c: + * API/tests/JSNodeList.c: + * Configurations/Base.xcconfig: + * JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd: + * JavaScriptCore.xcodeproj/project.pbxproj: + * assembler/MacroAssemblerCodeRef.h: + * bytecompiler/BytecodeGenerator.h: + * dfg/DFGOperations.cpp: + * heap/GCAssertions.h: + * heap/HandleHeap.h: + * heap/HandleStack.h: + * heap/MarkedSpace.h: + * heap/PassWeak.h: + * heap/Strong.h: + * heap/Weak.h: + * jit/HostCallReturnValue.cpp: + * jit/JIT.cpp: + * jit/JITStubs.cpp: + * jit/ThunkGenerators.cpp: + * parser/Lexer.cpp: + * runtime/Completion.cpp: + * runtime/Executable.cpp: + * runtime/Identifier.h: + * runtime/InitializeThreading.cpp: + * runtime/JSDateMath.cpp: + * runtime/JSGlobalObjectFunctions.cpp: + * runtime/JSStringBuilder.h: + * runtime/JSVariableObject.h: + * runtime/NumberPrototype.cpp: + * runtime/WriteBarrier.h: + * tools/CodeProfile.cpp: + * tools/TieredMMapArray.h: + * yarr/YarrJIT.cpp: + 2012-03-06 Zoltan Herczeg [Qt][ARM] Speculative buildfix after r109834. diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig index 9bc4478fc01a6f37ef3745405510debf8d534d8b..40c11b647e9f25a9df2d8a1f4f555d3988969fd8 100644 --- a/Source/JavaScriptCore/Configurations/Base.xcconfig +++ b/Source/JavaScriptCore/Configurations/Base.xcconfig @@ -71,7 +71,7 @@ WARNING_CFLAGS_macosx_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32; // FIXME: JavaScriptCore 64-bit builds should build with -Wshorten-64-to-32 WARNING_CFLAGS_macosx_ppc64 = $(WARNING_CFLAGS_BASE); WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE); -HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS); +HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS); CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR)); CLANG_CXX_LIBRARY_1060 = libstdc++; diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd index 8ca95da57320935ae5da915eadeaa6afd9bb3904..2c0cfad0230499fe3d5a674f183e7e415b4c0008 100755 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd @@ -58,19 +58,6 @@ for %%d in ( xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%" >NUL ) -echo Copying WTF headers... -for %%d in ( - wtf - wtf\dtoa - wtf\text - wtf\threads - wtf\unicode - wtf\unicode\icu -) do ( - mkdir "%PrivateHeadersDirectory%\%%d" 2>NUL - xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL -) - echo Copying resources... mkdir "%ResourcesDirectory%" 2>NUL xcopy /y /d ..\JavaScriptCore.resources\* "%ResourcesDirectory%" >NUL diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index a27c3d2ceb90e618161c6bcf8ad4f8266cbe7668..fc3d45f518f07b1ee258f7baa229e30bd4740175 100644 --- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj +++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj @@ -3502,7 +3502,6 @@ buildConfigurationList = 149C275D08902AFE008A9EFC /* Build configuration list for PBXNativeTarget "JavaScriptCore" */; buildPhases = ( 5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */, - A8D7082715049EA2001063BC /* Copy WTF Headers */, 932F5B3F0822A1C700736975 /* Headers */, 932F5B910822A1C700736975 /* Sources */, 932F5BD20822A1C700736975 /* Frameworks */, @@ -3731,20 +3730,6 @@ shellPath = /bin/sh; shellScript = "if [ \"${TARGET_GCC_VERSION}\" = \"LLVM_COMPILER\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-exit-time-destructors ]; then\n ../../Tools/Scripts/check-for-exit-time-destructors || exit $?\nfi"; }; - A8D7082715049EA2001063BC /* Copy WTF Headers */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy WTF Headers"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# WTF_PRIVATE_HEADERS_PATH will be replaced by PRIVATE_HEADERS_FOLDER_PATH\n# in the equivalent build-phase when WTF is its own project.\nWTF_PRIVATE_HEADERS_PATH=\"/usr/local/include\"\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\nPRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nelse\nPRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf\" \"${PRIVATE_HEADERS_PATH}\"\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h index ac62c422103323bb0d6ebea72a62ff1614703a46..6673ebd5b30c7433b59ddf382b10ee9fc269a84a 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h @@ -27,9 +27,9 @@ #define MacroAssemblerCodeRef_h #include "ExecutableAllocator.h" -#include -#include -#include +#include "PassRefPtr.h" +#include "RefPtr.h" +#include "UnusedParam.h" // ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid // instruction address on the platform (for example, check any alignment requirements). diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h index e7fe236e5baf0f0fb7e92e4698c56e84ccef87c5..c44812c7e85bc5490f3c7aad42e32fea02417840 100644 --- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h +++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h @@ -32,7 +32,7 @@ #define BytecodeGenerator_h #include "CodeBlock.h" -#include +#include "HashTraits.h" #include "Instruction.h" #include "Label.h" #include "LabelScope.h" diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp index 304c54d95a9e7b194d33bc7a135323e54dbda894..a526221e722f097ca6e8b6765e0424e071a3597e 100644 --- a/Source/JavaScriptCore/dfg/DFGOperations.cpp +++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp @@ -31,7 +31,7 @@ #include "DFGRepatch.h" #include "HostCallReturnValue.h" #include "GetterSetter.h" -#include +#include "InlineASM.h" #include "Interpreter.h" #include "JSActivation.h" #include "JSByteArray.h" diff --git a/Source/JavaScriptCore/heap/GCAssertions.h b/Source/JavaScriptCore/heap/GCAssertions.h index 9feefe1d17a8854379a21a1312e729b4a9b48db0..f044df6f06202a6b33d2a189757ab55ffec20539 100644 --- a/Source/JavaScriptCore/heap/GCAssertions.h +++ b/Source/JavaScriptCore/heap/GCAssertions.h @@ -26,7 +26,7 @@ #ifndef GCAssertions_h #define GCAssertions_h -#include +#include "Assertions.h" #if ENABLE(GC_VALIDATION) #define ASSERT_GC_OBJECT_LOOKS_VALID(cell) do { \ diff --git a/Source/JavaScriptCore/heap/HandleHeap.h b/Source/JavaScriptCore/heap/HandleHeap.h index c9ee11b2f54565ed6ed9d0023b02194fbf14626f..3b9db37a2e7b836d55680764b6d736fa9e3d8a38 100644 --- a/Source/JavaScriptCore/heap/HandleHeap.h +++ b/Source/JavaScriptCore/heap/HandleHeap.h @@ -26,11 +26,11 @@ #ifndef HandleHeap_h #define HandleHeap_h -#include +#include "BlockStack.h" #include "Handle.h" -#include -#include -#include +#include "HashCountedSet.h" +#include "SentinelLinkedList.h" +#include "SinglyLinkedList.h" namespace JSC { diff --git a/Source/JavaScriptCore/heap/HandleStack.h b/Source/JavaScriptCore/heap/HandleStack.h index 858ebf23fc4a6ae71fc1d5462351f1c3f8d8e200..a1e8a0b2ad213a4edbcc9bb494bff0f1512bf097 100644 --- a/Source/JavaScriptCore/heap/HandleStack.h +++ b/Source/JavaScriptCore/heap/HandleStack.h @@ -26,8 +26,8 @@ #ifndef HandleStack_h #define HandleStack_h -#include -#include +#include "Assertions.h" +#include "BlockStack.h" #include "Handle.h" #include diff --git a/Source/JavaScriptCore/heap/MarkedSpace.h b/Source/JavaScriptCore/heap/MarkedSpace.h index b553eb1b13052b7e6c916f4dbd73e88872a1de47..cfcf3f8dc9b6378f61b20f5ac4022c6b9d83d928 100644 --- a/Source/JavaScriptCore/heap/MarkedSpace.h +++ b/Source/JavaScriptCore/heap/MarkedSpace.h @@ -26,7 +26,7 @@ #include "MarkedAllocator.h" #include "MarkedBlock.h" #include "MarkedBlockSet.h" -#include +#include "PageAllocationAligned.h" #include #include #include diff --git a/Source/JavaScriptCore/heap/PassWeak.h b/Source/JavaScriptCore/heap/PassWeak.h index 0d86e6c65a2d671e23a806a78ee677428321a9dc..b7aa7b10d5ebbc3dbd601ece3b657300f10e53e8 100644 --- a/Source/JavaScriptCore/heap/PassWeak.h +++ b/Source/JavaScriptCore/heap/PassWeak.h @@ -26,10 +26,10 @@ #ifndef PassWeak_h #define PassWeak_h -#include +#include "Assertions.h" #include "Handle.h" -#include -#include +#include "NullPtr.h" +#include "TypeTraits.h" namespace JSC { diff --git a/Source/JavaScriptCore/heap/Strong.h b/Source/JavaScriptCore/heap/Strong.h index d2f2a2278d606f5be6c9b2ba16e633230aa595dd..a9389fa530158a3130cefaa7e47c7dbdcc566a51 100644 --- a/Source/JavaScriptCore/heap/Strong.h +++ b/Source/JavaScriptCore/heap/Strong.h @@ -26,7 +26,7 @@ #ifndef Strong_h #define Strong_h -#include +#include "Assertions.h" #include "Handle.h" #include "HandleHeap.h" diff --git a/Source/JavaScriptCore/heap/Weak.h b/Source/JavaScriptCore/heap/Weak.h index 8291e4440818b31f235f0aaf4c6f9902f1f3beb7..96fe1b58ced742134c9afdb70214aa5aa2a65a53 100644 --- a/Source/JavaScriptCore/heap/Weak.h +++ b/Source/JavaScriptCore/heap/Weak.h @@ -26,7 +26,7 @@ #ifndef Weak_h #define Weak_h -#include +#include "Assertions.h" #include "Handle.h" #include "HandleHeap.h" #include "JSGlobalData.h" diff --git a/Source/JavaScriptCore/jit/HostCallReturnValue.cpp b/Source/JavaScriptCore/jit/HostCallReturnValue.cpp index 9d449c374be1777585841a39fe95b80495625520..924bc7671991058e13c00d93094b2dee894f26d9 100644 --- a/Source/JavaScriptCore/jit/HostCallReturnValue.cpp +++ b/Source/JavaScriptCore/jit/HostCallReturnValue.cpp @@ -27,7 +27,7 @@ #include "HostCallReturnValue.h" #include "CallFrame.h" -#include +#include "InlineASM.h" #include "JSObject.h" #include "JSValueInlineMethods.h" #include "ScopeChain.h" diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp index eb2ee7748706ab8f818f9ec5ea77afbfb02d5561..980179a6d6c877b7434bc37bedeb172a4a0e5c56 100644 --- a/Source/JavaScriptCore/jit/JIT.cpp +++ b/Source/JavaScriptCore/jit/JIT.cpp @@ -35,7 +35,7 @@ JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse #endif #include "CodeBlock.h" -#include +#include "CryptographicallyRandomNumber.h" #include "DFGNode.h" // for DFG_SUCCESS_STATS #include "Interpreter.h" #include "JITInlineMethods.h" diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp index eebe90427aec1c5d56abbcb96f60255c9e792511..b22c337e8cd9973da3d18510e66365106b2ea3d0 100644 --- a/Source/JavaScriptCore/jit/JITStubs.cpp +++ b/Source/JavaScriptCore/jit/JITStubs.cpp @@ -43,7 +43,7 @@ #include "ExceptionHelpers.h" #include "GetterSetter.h" #include "Heap.h" -#include +#include "InlineASM.h" #include "JIT.h" #include "JITExceptions.h" #include "JSActivation.h" diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp index 371aff2f95b59ab3aa3c5ed274f7885a09a75b83..099796986813466001534ca31ae386bb3b4c7b82 100644 --- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp +++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp @@ -27,7 +27,7 @@ #include "ThunkGenerators.h" #include "CodeBlock.h" -#include +#include "InlineASM.h" #include "SpecializedThunkJIT.h" #include diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp index 8d50afc543b6e0ca3c02907a3426d49b538ab60d..8390077af38060f5a0afa138ca18053067006c6d 100644 --- a/Source/JavaScriptCore/parser/Lexer.cpp +++ b/Source/JavaScriptCore/parser/Lexer.cpp @@ -31,7 +31,7 @@ #include "Identifier.h" #include "NodeInfo.h" #include "Nodes.h" -#include +#include "dtoa.h" #include #include #include diff --git a/Source/JavaScriptCore/runtime/Completion.cpp b/Source/JavaScriptCore/runtime/Completion.cpp index ce620245b34e1dadf828ec292dcba9ad1c467095..98a66589a2b216e01aae8eb47133af55f609f9fb 100644 --- a/Source/JavaScriptCore/runtime/Completion.cpp +++ b/Source/JavaScriptCore/runtime/Completion.cpp @@ -30,7 +30,7 @@ #include "Interpreter.h" #include "Parser.h" #include "Debugger.h" -#include +#include "WTFThreadData.h" #include namespace JSC { diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp index 217a852521423c04c6baf394598ef2d4047c4729..ea0b42befad0ca02aeb507893de09c10b2b49ba9 100644 --- a/Source/JavaScriptCore/runtime/Executable.cpp +++ b/Source/JavaScriptCore/runtime/Executable.cpp @@ -34,7 +34,7 @@ #include "JITDriver.h" #include "Parser.h" #include "UStringBuilder.h" -#include +#include "Vector.h" namespace JSC { diff --git a/Source/JavaScriptCore/runtime/Identifier.h b/Source/JavaScriptCore/runtime/Identifier.h index b9e5a185449239787460292a22eab352bf7b8e22..947c95b33b2d82a98f100c85a301d5be89c36d67 100644 --- a/Source/JavaScriptCore/runtime/Identifier.h +++ b/Source/JavaScriptCore/runtime/Identifier.h @@ -22,7 +22,7 @@ #define Identifier_h #include "JSGlobalData.h" -#include +#include "ThreadSpecific.h" #include "UString.h" #include #include diff --git a/Source/JavaScriptCore/runtime/InitializeThreading.cpp b/Source/JavaScriptCore/runtime/InitializeThreading.cpp index b6fd6ce1f005e8eee6fe20e33c450119fff36bbf..2b874c708e9b1e0ce996b8ed92dca15991ab1a38 100644 --- a/Source/JavaScriptCore/runtime/InitializeThreading.cpp +++ b/Source/JavaScriptCore/runtime/InitializeThreading.cpp @@ -37,7 +37,7 @@ #include "JSGlobalObject.h" #include "UString.h" #include "WriteBarrier.h" -#include +#include "dtoa.h" #include #include diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp index 882f86fa065ccd0d3d05e78f6f59efda4dcf4ce0..8630733386b89337d0ca77b232d837f35409a0b2 100644 --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp @@ -72,6 +72,8 @@ #include "config.h" #include "JSDateMath.h" +#include "Assertions.h" +#include "ASCIICType.h" #include "CurrentTime.h" #include "JSObject.h" #include "MathExtras.h" @@ -84,8 +86,6 @@ #include #include #include -#include -#include #include #if HAVE(ERRNO_H) diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index 75789e6021dd2b46cf190daefbae3a737e3ad520..db8ee1d854685f3420173ee9ffa51976e047c9d7 100644 --- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -35,7 +35,7 @@ #include "Nodes.h" #include "Parser.h" #include "UStringBuilder.h" -#include +#include "dtoa.h" #include #include #include diff --git a/Source/JavaScriptCore/runtime/JSStringBuilder.h b/Source/JavaScriptCore/runtime/JSStringBuilder.h index 1a2b812f0f2ad208576c0c98caa72c6a27a5b2a4..b7e7e781e1f0d096986e6759d673243b26a6f6ea 100644 --- a/Source/JavaScriptCore/runtime/JSStringBuilder.h +++ b/Source/JavaScriptCore/runtime/JSStringBuilder.h @@ -29,7 +29,7 @@ #include "ExceptionHelpers.h" #include "JSString.h" #include "UStringConcatenate.h" -#include +#include "Vector.h" namespace JSC { diff --git a/Source/JavaScriptCore/runtime/JSVariableObject.h b/Source/JavaScriptCore/runtime/JSVariableObject.h index bcfe4ab895f60a9928c4219a4b41d36e173c4cad..8d058f1fcbd3657a6e748b1b5e07166eb0a7bd6f 100644 --- a/Source/JavaScriptCore/runtime/JSVariableObject.h +++ b/Source/JavaScriptCore/runtime/JSVariableObject.h @@ -32,7 +32,7 @@ #include "JSObject.h" #include "Register.h" #include "SymbolTable.h" -#include +#include "UnusedParam.h" #include #include diff --git a/Source/JavaScriptCore/runtime/NumberPrototype.cpp b/Source/JavaScriptCore/runtime/NumberPrototype.cpp index 8f8c3c00f958f501369c92668248740bd3894fa3..fb90bcd17ea1451ee54214f87b5a89a53f187349 100644 --- a/Source/JavaScriptCore/runtime/NumberPrototype.cpp +++ b/Source/JavaScriptCore/runtime/NumberPrototype.cpp @@ -29,7 +29,7 @@ #include "JSString.h" #include "Operations.h" #include "Uint16WithFraction.h" -#include +#include "dtoa.h" #include #include #include diff --git a/Source/JavaScriptCore/runtime/WriteBarrier.h b/Source/JavaScriptCore/runtime/WriteBarrier.h index 05f3bc5bba93eecf046ba5e3d870d098563bc0a4..7e9db12fb8be04f4f2a55bd075c4cdc454ef807b 100644 --- a/Source/JavaScriptCore/runtime/WriteBarrier.h +++ b/Source/JavaScriptCore/runtime/WriteBarrier.h @@ -30,7 +30,7 @@ #include "HandleTypes.h" #include "Heap.h" #include "SamplingCounter.h" -#include +#include "TypeTraits.h" namespace JSC { diff --git a/Source/JavaScriptCore/tools/CodeProfile.cpp b/Source/JavaScriptCore/tools/CodeProfile.cpp index beed4b2d5a4f31c9156fb6657cc116481f99d0a0..349353eb2df8c8a4b3beb8f31459dabba3931abd 100644 --- a/Source/JavaScriptCore/tools/CodeProfile.cpp +++ b/Source/JavaScriptCore/tools/CodeProfile.cpp @@ -30,7 +30,7 @@ #include "CodeProfiling.h" #include "LinkBuffer.h" #include "ProfileTreeNode.h" -#include +#include "Vector.h" #include #if PLATFORM(MAC) diff --git a/Source/JavaScriptCore/tools/TieredMMapArray.h b/Source/JavaScriptCore/tools/TieredMMapArray.h index 03d9df2b7787b692d2d1bcb60d754ad32ae31019..fa6e5ae1fd1b4e7832dd56abcfbb9b80bcc43d25 100644 --- a/Source/JavaScriptCore/tools/TieredMMapArray.h +++ b/Source/JavaScriptCore/tools/TieredMMapArray.h @@ -26,7 +26,7 @@ #ifndef TieredMMapArray_h #define TieredMMapArray_h -#include +#include "OSAllocator.h" namespace JSC { diff --git a/Source/JavaScriptCore/yarr/YarrJIT.cpp b/Source/JavaScriptCore/yarr/YarrJIT.cpp index 2269792ec31d216cdab25d454ee6fd6a1a007230..da742ab8da16b34c91ddc42762959fa5cbb0cd83 100644 --- a/Source/JavaScriptCore/yarr/YarrJIT.cpp +++ b/Source/JavaScriptCore/yarr/YarrJIT.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "YarrJIT.h" -#include +#include "ASCIICType.h" #include "LinkBuffer.h" #include "Yarr.h" diff --git a/Tools/ChangeLog b/Tools/ChangeLog index d00a38b5a2be7160630ee542d98e844531def9e0..2764c710e685e8ff2cc83fb642b4afdd53f9e287 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,14 @@ +2012-03-06 Sheriff Bot + + Unreviewed, rolling out r109837. + http://trac.webkit.org/changeset/109837 + https://bugs.webkit.org/show_bug.cgi?id=80399 + + breaks Mac Productions builds, too late to try and fix it + tonight (Requested by eseidel on #webkit). + + * Scripts/build-webkit: + 2012-03-06 Tor Arne Vestbø [Qt] Use correct define names for HAVE(FOO) style optional dependencies diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit index 00c64c7883b80add54e449f48e6df815b1f047ff..e9f0e338fa1d876c9e92f1ff0e46004c7b49d867 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit @@ -491,9 +491,6 @@ sub unlinkZeroFiles() # Check that all the project directories are there. my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit"); -# Build WTF as a separate static library on ports which support it. -splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit(); - for my $dir (@projects) { if (! -d $dir) { die "Error: No $dir directory found. Please do a fresh checkout.\n";