102227 2012-11-14 06:52:54 -0800 Fix the MIPS build after r134332 2012-11-14 07:26:01 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ All All RESOLVED FIXED P2 Normal --- 101909 1 ossy webkit-unassigned galpeter kilvadyb ossy webkit.review.bot oldest_to_newest 766851 0 ossy 2012-11-14 06:52:54 -0800 In file included from /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/bytecode/CallLinkInfo.cpp:31: /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h: In static member function 'static JSC::CodeLocationLabel JSC::RepatchBuffer::startOfPatchableBranchPtrWithPatch(JSC::CodeLocationDataLabelPtr)': /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h:146: error: 'startOfPatchableBranchPtrWithPatch' is not a member of 'JSC::MacroAssembler' In file included from /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/bytecode/CallLinkInfo.cpp:31: /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h: In member function 'void JSC::RepatchBuffer::revertJumpReplacementToPatchableBranchPtrWithPatch(JSC::CodeLocationLabel, JSC::AbstractMacroAssembler<JSC::MIPSAssembler>::Address, void*)': /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h:159: error: 'revertJumpReplacementToPatchableBranchPtrWithPatch' is not a member of 'JSC::MacroAssembler' make[2]: *** [obj/release/bytecode/CallLinkInfo.o] Error 1 make[2]: *** Waiting for unfinished jobs.... In file included from /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/bytecode/CodeBlock.cpp:46: /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h: In static member function 'static JSC::CodeLocationLabel JSC::RepatchBuffer::startOfPatchableBranchPtrWithPatch(JSC::CodeLocationDataLabelPtr)': /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h:146: error: 'startOfPatchableBranchPtrWithPatch' is not a member of 'JSC::MacroAssembler' In file included from /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/bytecode/CodeBlock.cpp:46: /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h: In member function 'void JSC::RepatchBuffer::revertJumpReplacementToPatchableBranchPtrWithPatch(JSC::CodeLocationLabel, JSC::AbstractMacroAssembler<JSC::MIPSAssembler>::Address, void*)': /data/buildbot/mips-1/qt-linux-mipsel-mips32r2-release/build/Source/JavaScriptCore/assembler/RepatchBuffer.h:159: error: 'revertJumpReplacementToPatchableBranchPtrWithPatch' is not a member of 'JSC::MacroAssembler' make[2]: *** [obj/release/bytecode/CodeBlock.o] Error 1 http://trac.webkit.org/changeset/134383 is a similar fix for ARM traditional (and http://trac.webkit.org/changeset/134603 is the warning fix) 766854 1 galpeter 2012-11-14 06:56:31 -0800 ohh... okay... will do it in a jiffy 766858 2 174150 galpeter 2012-11-14 07:04:53 -0800 Created attachment 174150 speculative fix This should get rid of the compile fail. 766862 3 174150 ossy 2012-11-14 07:08:02 -0800 Comment on attachment 174150 speculative fix LGTM, r=me. 766873 4 174150 webkit.review.bot 2012-11-14 07:25:58 -0800 Comment on attachment 174150 speculative fix Clearing flags on attachment: 174150 Committed r134608: <http://trac.webkit.org/changeset/134608> 766874 5 webkit.review.bot 2012-11-14 07:26:01 -0800 All reviewed patches have been landed. Closing bug. 174150 2012-11-14 07:04:53 -0800 2012-11-14 07:25:57 -0800 speculative fix macroassembler_mips_patchablebranch.patch text/plain 1939 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGJlMTA1ZjQuLmU4Y2Q0YWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTExLTE0ICBQZXRlciBHYWwgIDxn YWxwZXRlckBpbmYudS1zemVnZWQuaHU+CiAKKyAgICAgICAgRml4IHRoZSBNSVBTIGJ1aWxkIGFm dGVyIHIxMzQzMzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMjIyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIG1pc3NpbmcgbWV0aG9kcyBmb3IgdGhlIE1hY3JvQXNzZW1ibGVyTUlQUywgYmFz ZWQgb24gdGhlIE1hY3JvQXNzZW1ibGVyQVJNdjcuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyTUlQUzo6Y2Fu SnVtcFJlcGxhY2VQYXRjaGFibGVCcmFuY2hQdHJXaXRoUGF0Y2gpOgorICAgICAgICAoTWFjcm9B c3NlbWJsZXJNSVBTKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJNSVBTOjpzdGFydE9m UGF0Y2hhYmxlQnJhbmNoUHRyV2l0aFBhdGNoKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJs ZXJNSVBTOjpyZXZlcnRKdW1wUmVwbGFjZW1lbnRUb1BhdGNoYWJsZUJyYW5jaFB0cldpdGhQYXRj aCk6CisKKzIwMTItMTEtMTQgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4K KwogICAgICAgICBGaXggdGhlIFstV3JldHVybi10eXBlXSB3YXJuaW5nIGluIEphdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIyMDYKIApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKaW5kZXggZmM2ZjlmNC4u NWI2ZGE5NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlck1JUFMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyTUlQUy5oCkBAIC0yMjQyLDYgKzIyNDIsMjAgQEAgcHVibGljOgogICAgICAg ICByZXR1cm4gMDsKICAgICB9CiAKKyAgICBzdGF0aWMgYm9vbCBjYW5KdW1wUmVwbGFjZVBhdGNo YWJsZUJyYW5jaFB0cldpdGhQYXRjaCgpIHsgcmV0dXJuIGZhbHNlOyB9CisKKyAgICBzdGF0aWMg Q29kZUxvY2F0aW9uTGFiZWwgc3RhcnRPZlBhdGNoYWJsZUJyYW5jaFB0cldpdGhQYXRjaChDb2Rl TG9jYXRpb25EYXRhTGFiZWxQdHIgbGFiZWwpCisgICAgeworICAgICAgICBVTlJFQUNIQUJMRV9G T1JfUExBVEZPUk0oKTsKKyAgICAgICAgcmV0dXJuIENvZGVMb2NhdGlvbkxhYmVsKCk7CisgICAg fQorCisgICAgc3RhdGljIHZvaWQgcmV2ZXJ0SnVtcFJlcGxhY2VtZW50VG9QYXRjaGFibGVCcmFu Y2hQdHJXaXRoUGF0Y2goQ29kZUxvY2F0aW9uTGFiZWwgaW5zdHJ1Y3Rpb25TdGFydCwgQWRkcmVz cywgdm9pZCogaW5pdGlhbFZhbHVlKQorICAgIHsKKyAgICAgICAgVU5SRUFDSEFCTEVfRk9SX1BM QVRGT1JNKCk7CisgICAgfQorCisKIHByaXZhdGU6CiAgICAgLy8gSWYgbV9maXhlZFdpZHRoIGlz IHRydWUsIHdlIHdpbGwgZ2VuZXJhdGUgYSBmaXhlZCBudW1iZXIgb2YgaW5zdHJ1Y3Rpb25zLgog ICAgIC8vIE90aGVyd2lzZSwgd2UgY2FuIGVtaXQgYW55IG51bWJlciBvZiBpbnN0cnVjdGlvbnMu Cg==