122890 2013-10-16 05:13:47 -0700 Build break on ARMv7 after r157209 2013-10-22 04:55:54 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108645 1 ryuan.choi ryuan.choi brian.holt commit-queue fpizlo ossy rgabor zherczeg oldest_to_newest 940353 0 ryuan.choi 2013-10-16 05:13:47 -0700 MacroAssemblerARMv7 does not have framePointerRegister 940354 1 214357 ryuan.choi 2013-10-16 05:16:39 -0700 Created attachment 214357 Patch 941078 2 214357 ryuan.choi 2013-10-17 19:09:13 -0700 Comment on attachment 214357 Patch I realized that we need more fixes including this. 941080 3 fpizlo 2013-10-17 19:35:40 -0700 About to land speculative fix... 941081 4 fpizlo 2013-10-17 19:35:56 -0700 (In reply to comment #3) > About to land speculative fix... Never mind, I'm confused. 941082 5 fpizlo 2013-10-17 19:37:45 -0700 (In reply to comment #4) > (In reply to comment #3) > > About to land speculative fix... > > Never mind, I'm confused. Actually, no, I am not confused. Fix on the way. 941083 6 fpizlo 2013-10-17 19:38:06 -0700 (In reply to comment #2) > (From update of attachment 214357 [details]) > I realized that we need more fixes including this. Can you elaborate? 941084 7 fpizlo 2013-10-17 19:42:27 -0700 Landed a speculative fix in http://trac.webkit.org/changeset/157618 941089 8 ryuan.choi 2013-10-17 20:48:02 -0700 (In reply to comment #6) > (In reply to comment #2) > > (From update of attachment 214357 [details] [details]) > > I realized that we need more fixes including this. > > Can you elaborate? I am not sure. I am not familiar with jsc code although I want to fix. Below is the part of logs which I met.(And there are more and similar breaks) [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JITInlines.h: In member function 'JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::Call JSC::JIT::callOperation(JSC::F_JITOperation_EJJZ, JSC::GPRReg, JSC::GPRReg, JSC::GPRReg, JSC::GPRReg, int32_t)': [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JITInlines.h:434:112: error: no matching function for call to 'JSC::JIT::setupArgumentsWithExecState(JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImm32, JSC::GPRReg&, JSC::GPRReg&, JSC::GPRReg&, JSC::GPRReg&, JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImm32)' [ 84s] setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG arg1Payload, arg1Tag, arg2Payload, arg2Tag, TrustedImm32(arg3)); [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JITInlines.h:434:112: note: candidates are: [ 84s] In file included from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JSInterfaceJIT.h:30:0, [ 84s] from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JIT.h:45, [ 84s] from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JITArithmetic.cpp:29: [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:712:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::FPRReg, JSC::GPRReg) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(FPRReg arg1, GPRReg arg2) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:712:52: note: candidate expects 2 arguments, 6 provided [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:719:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::GPRReg, JSC::GPRReg, JSC::FPRReg) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, FPRReg arg3) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:719:52: note: candidate expects 3 arguments, 6 provided [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:727:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImm32, JSC::FPRReg, JSC::GPRReg) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, FPRReg arg2, GPRReg arg3) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:727:52: note: candidate expects 3 arguments, 6 provided [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:735:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::GPRReg, JSC::GPRReg, JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImm32, JSC::FPRReg) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, FPRReg arg4) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:735:52: note: candidate expects 4 arguments, 6 provided [ 84s] In file included from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JSInterfaceJIT.h:30:0, [ 84s] from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JIT.h:45, [ 84s] from /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/JITArithmetic.cpp:29: [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:843:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::GPRReg) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:843:52: note: candidate expects 1 argument, 6 provided [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:849:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImmPtr) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1) [ 84s] ^ [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:849:52: note: candidate expects 1 argument, 6 provided [ 84s] /home/abuild/rpmbuild/BUILD/webkit2-efl-157512_0.10.142.0/Source/JavaScriptCore/jit/CCallHelpers.h:855:52: note: void JSC::CCallHelpers::setupArgumentsWithExecState(JSC::AbstractMacroAssembler<JSC::ARMv7Assembler>::TrustedImm32) [ 84s] ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1) [ 84s] ^ Anyway, Thank you so much to fix the issues. :) 941812 9 brian.holt 2013-10-21 05:04:26 -0700 (In reply to comment #7) > Landed a speculative fix in http://trac.webkit.org/changeset/157618 fpizlo, it seems like this is still a problem with ARM_TRADITIONAL: This diff resolves it (rgabor confirmed that the frame pointer is r5 for TRADITIONAL) diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.h b/Source/JavaScriptCore/assembler/ARMAssembler.h index 89d29a1..6744789 100644 --- a/Source/JavaScriptCore/assembler/ARMAssembler.h +++ b/Source/JavaScriptCore/assembler/ARMAssembler.h @@ -43,7 +43,7 @@ namespace JSC { r2, r3, S0 = r3, /* Same as thumb assembler. */ r4, - r5, + r5, fp = r5, // frame pointer r6, r7, r8, diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h index 3a37204..27684d5 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -42,6 +42,12 @@ class MacroAssemblerARM : public AbstractMacroAssembler<ARMAssembler> { public: typedef ARMRegisters::FPRegisterID FPRegisterID; + static RegisterID firstRegister() { return ARMRegisters::r0; } + static RegisterID lastRegister() { return ARMRegisters::r15; } + + static FPRegisterID firstFPRegister() { return ARMRegisters::d0; } + static FPRegisterID lastFPRegister() { return ARMRegisters::d31; } + enum RelationalCondition { Equal = ARMAssembler::EQ, NotEqual = ARMAssembler::NE, @@ -81,6 +87,7 @@ public: }; static const RegisterID stackPointerRegister = ARMRegisters::sp; + static const RegisterID framePointerRegister = ARMRegisters::fp; static const RegisterID linkRegister = ARMRegisters::lr; static const Scale ScalePtr = TimesFour; 941816 10 214730 brian.holt 2013-10-21 05:17:13 -0700 Created attachment 214730 Patch for ARM TRADITIONAL 942230 11 214730 ossy 2013-10-22 04:31:54 -0700 Comment on attachment 214730 Patch for ARM TRADITIONAL r=me 942238 12 214730 commit-queue 2013-10-22 04:55:51 -0700 Comment on attachment 214730 Patch for ARM TRADITIONAL Clearing flags on attachment: 214730 Committed r157784: <http://trac.webkit.org/changeset/157784> 942239 13 commit-queue 2013-10-22 04:55:54 -0700 All reviewed patches have been landed. Closing bug. 214357 2013-10-16 05:16:39 -0700 2013-10-21 05:17:06 -0700 Patch bug-122890-20131016211637.patch text/plain 1337 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 YTk1NTAwOWE2YmFiM2RmZGViNzI2NmZmNDdlYjY5YzkyNjY1NWJlLi5hNWQzMWRjMzE0ZTliMzE4 YjE3ODMxMTJjNzVmYTVhZTc3OWFmMTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMy0xMC0xNiAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5j b20+CisKKyAgICAgICAgQnVpbGQgYnJlYWsgb24gQVJNdjcgYWZ0ZXIgcjE1NzIwOQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJBUk12Ny5oOgorICAgICAgICBBZGRlZCBmcmFtZVBvaW50ZXJSZWdpc3RlciB3 aGljaCBpcyB1c2VkIGJ5IGlzU3RhY2tSZWxhdGVkKCkuCisKIDIwMTMtMTAtMTYgIEp1bGllbiBC cmlhbmNlYXUgIDxqYnJpYW5jZUBjaXNjby5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1vcmUgb2Yg dGhlIFVOSU5URVJSVVBURURfU0VRVUVOQ0UgdGhpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKaW5kZXggYjMwNzZhMDQw MGZlZjJlZjc1ZDgwODY1OGJlM2FlNDE1YWNkNDFmOC4uODBmM2RhNDQ0YTYxMjRlYmMxNDdkMTdi YmQ0NTE1MjhmYjZhNTMxOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKQEAgLTE0Niw2ICsxNDYsNyBAQCBwdWJsaWM6 CiAgICAgfTsKIAogICAgIHN0YXRpYyBjb25zdCBSZWdpc3RlcklEIHN0YWNrUG9pbnRlclJlZ2lz dGVyID0gQVJNUmVnaXN0ZXJzOjpzcDsKKyAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBmcmFt ZVBvaW50ZXJSZWdpc3RlciA9IEFSTVJlZ2lzdGVyczo6ZnA7CiAgICAgc3RhdGljIGNvbnN0IFJl Z2lzdGVySUQgbGlua1JlZ2lzdGVyID0gQVJNUmVnaXN0ZXJzOjpscjsKIAogICAgIC8vIEludGVn ZXIgYXJpdGhtZXRpYyBvcGVyYXRpb25zOgo= 214730 2013-10-21 05:17:13 -0700 2013-10-22 04:55:51 -0700 Patch for ARM TRADITIONAL bug-122890-20131021131725.patch text/plain 2650 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 N2Q4MGQxYjA1Njc2M2E5MGQwMGY0YWYyZjA1NmZhMzA0ZmExNzlmLi5iOTIzN2ViZjU3ZTQ5MDRm NDcwMjUyOWNjNzJmMjhkY2VjNGQ5MzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMy0xMC0yMSAgQnJpYW4gSG9sdCAgPGJyaWFuLmhvbHRAc2Ftc3VuZy5j b20+CisKKyAgICAgICAgQnVpbGQgYnJlYWsgb24gQVJNdjcgYWZ0ZXIgcjE1NzIwOQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGZyYW1lUG9pbnRl clJlZ2lzdGVyIGFuZCBmaXJzdC9sYXN0IHJlZ2lzdGVyIGhlbHBlcnMgZm9yIEFSTV9UUkFESVRJ T05BTC4KKworICAgICAgICAqIGFzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaDoKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJs ZXJBUk06OmZpcnN0UmVnaXN0ZXIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6 bGFzdFJlZ2lzdGVyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk06OmZpcnN0RlBS ZWdpc3Rlcik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpsYXN0RlBSZWdpc3Rl cik6CisKIDIwMTMtMTAtMjEgIE5hZGF2IFJvdGVtICA8bnJvdGVtQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW1vdmUgQWxsSW5PbmVGaWxlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgKaW5kZXggODlkMjlhMTAzZDNiNzMwNmFjNTViOWRkYThl MDM5NWFiZWExNzc3YS4uNjc0NDc4OWNlZGEyYjRiYjYzYTI1Y2Q4NTBhODBhNjg5ZDY4MWRjZiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oCkBA IC00Myw3ICs0Myw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgcjIsCiAgICAgICAg ICAgICByMywgUzAgPSByMywgLyogU2FtZSBhcyB0aHVtYiBhc3NlbWJsZXIuICovCiAgICAgICAg ICAgICByNCwKLSAgICAgICAgICAgIHI1LAorICAgICAgICAgICAgcjUsIGZwID0gcjUsIC8vIGZy YW1lIHBvaW50ZXIKICAgICAgICAgICAgIHI2LAogICAgICAgICAgICAgcjcsCiAgICAgICAgICAg ICByOCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJBUk0uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3Nl bWJsZXJBUk0uaAppbmRleCAzYTM3MjA0NDE4OTBkZTYyNTg1ZTgxZGQ1YmUzYjI4YzEwYjQyNzdh Li4yNzY4NGQ1MWZjNGQ0ODUxNTY3YjE4OWE0YjM3ZjhiNWU5OTBkNGQ2IDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCkBAIC00 Miw2ICs0MiwxMiBAQCBjbGFzcyBNYWNyb0Fzc2VtYmxlckFSTSA6IHB1YmxpYyBBYnN0cmFjdE1h Y3JvQXNzZW1ibGVyPEFSTUFzc2VtYmxlcj4gewogcHVibGljOgogICAgIHR5cGVkZWYgQVJNUmVn aXN0ZXJzOjpGUFJlZ2lzdGVySUQgRlBSZWdpc3RlcklEOwogCisgICAgc3RhdGljIFJlZ2lzdGVy SUQgZmlyc3RSZWdpc3RlcigpIHsgcmV0dXJuIEFSTVJlZ2lzdGVyczo6cjA7IH0KKyAgICBzdGF0 aWMgUmVnaXN0ZXJJRCBsYXN0UmVnaXN0ZXIoKSB7IHJldHVybiBBUk1SZWdpc3RlcnM6OnIxNTsg fQorCisgICAgc3RhdGljIEZQUmVnaXN0ZXJJRCBmaXJzdEZQUmVnaXN0ZXIoKSB7IHJldHVybiBB Uk1SZWdpc3RlcnM6OmQwOyB9CisgICAgc3RhdGljIEZQUmVnaXN0ZXJJRCBsYXN0RlBSZWdpc3Rl cigpIHsgcmV0dXJuIEFSTVJlZ2lzdGVyczo6ZDMxOyB9CisKICAgICBlbnVtIFJlbGF0aW9uYWxD b25kaXRpb24gewogICAgICAgICBFcXVhbCA9IEFSTUFzc2VtYmxlcjo6RVEsCiAgICAgICAgIE5v dEVxdWFsID0gQVJNQXNzZW1ibGVyOjpORSwKQEAgLTgxLDYgKzg3LDcgQEAgcHVibGljOgogICAg IH07CiAKICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBzdGFja1BvaW50ZXJSZWdpc3RlciA9 IEFSTVJlZ2lzdGVyczo6c3A7CisgICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgZnJhbWVQb2lu dGVyUmVnaXN0ZXIgPSBBUk1SZWdpc3RlcnM6OmZwOwogICAgIHN0YXRpYyBjb25zdCBSZWdpc3Rl cklEIGxpbmtSZWdpc3RlciA9IEFSTVJlZ2lzdGVyczo6bHI7CiAKICAgICBzdGF0aWMgY29uc3Qg U2NhbGUgU2NhbGVQdHIgPSBUaW1lc0ZvdXI7Cg==