157890 2016-05-19 05:02:37 -0700 [ARM] Remove redefined macro after r200606 2016-05-19 07:18:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108645 151793 1 ossy ossy commit-queue fpizlo keith_miller mark.lam msaboff ossy saam oldest_to_newest 1194725 0 ossy 2016-05-19 05:02:37 -0700 http://trac.webkit.org/changeset/200606 caused the following build failure: ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:54:0: error: "EABI_32BIT_DUMMY_ARG" redefined [-Werror] #define EABI_32BIT_DUMMY_ARG CCallHelpers::TrustedImm32(0), ^ In file included from ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:32:0: ../../Source/JavaScriptCore/jit/CCallHelpers.h:47:0: note: this is the location of the previous definition #define EABI_32BIT_DUMMY_ARG TrustedImm32(0), ^ cc1plus: all warnings being treated as errors 1194726 1 ossy 2016-05-19 05:07:19 -0700 Removing the macro causes this build failure: ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp: In member function 'void JSC::AccessCase::generateImpl(JSC::AccessGenerationState&)': ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:1101:35: error: 'TrustedImm32' was not declared in this scope ../../Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:1106:35: error: 'TrustedImm32' was not declared in this scope TrustedImm32 is defined in AbstractMacroAssembler.h which shouldn't be included from PolymorphicAccess.cpp or CCallHelpers.h ... 1194727 2 ossy 2016-05-19 05:08:41 -0700 any better idea to fix it? 1194728 3 279382 ossy 2016-05-19 05:23:22 -0700 Created attachment 279382 Patch 1194729 4 ossy 2016-05-19 05:24:47 -0700 (In reply to comment #2) > any better idea to fix it? I got it, using CCallHelpers::TrustedImm32 everywhere works. 1194742 5 279382 msaboff 2016-05-19 06:42:39 -0700 Comment on attachment 279382 Patch r=me 1194751 6 279382 commit-queue 2016-05-19 07:18:12 -0700 Comment on attachment 279382 Patch Clearing flags on attachment: 279382 Committed r201161: <http://trac.webkit.org/changeset/201161> 1194752 7 commit-queue 2016-05-19 07:18:16 -0700 All reviewed patches have been landed. Closing bug. 279382 2016-05-19 05:23:22 -0700 2016-05-19 07:18:12 -0700 Patch bug-157890-20160519052421.patch text/plain 2874 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj OGEwZDQ1ZTFlNWFlNDcyYjQ1YjEwNjc5ZTE5MGM1ZGRiZTE1MjQ4Li44MGI5ZTcwMzVjZTc3YmQ1 ZGZlYWQ0NmNmMmMxZDA2MDI3YWJkOTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNi0wNS0xOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIFtBUk1dIFJlbW92ZSByZWRlZmluZWQgbWFjcm8gYWZ0ZXIgcjIwMDYw NgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3ODkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBieXRl Y29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHA6CisgICAgICAgICogaml0L0NDYWxsSGVscGVycy5o OgorCiAyMDE2LTA1LTE4ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAg ICAgIEZ1bmN0aW9uIHdpdGggZGVmYXVsdCBwYXJhbWV0ZXIgdmFsdWVzIHRoYXQgYXJlIGFycm93 IGZ1bmN0aW9ucyB0aGF0IGNhcHR1cmUgdGhpcyBpc24ndCB3b3JraW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAppbmRleCA3 MDY3YzQ5YmE0YWJmZjQ2MWViNTQ4YzRkMmU1YTJlODgwZWFiYzM1Li4yMDJkNWQ1NmJiOTI5OGUx ODZiYTMxNjZlZjJiZDU3NTFjMTU3NjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKQEAgLTQ4LDE0ICs0OCw2IEBAIG5h bWVzcGFjZSBKU0MgewogCiBzdGF0aWMgY29uc3QgYm9vbCB2ZXJib3NlID0gZmFsc2U7CiAKLS8v IEVuY29kZWRKU1ZhbHVlIGluIEpTVkFMVUUzMl82NCBpcyBhIDY0LWJpdCBpbnRlZ2VyLiBXaGVu IGJlaW5nIGNvbXBpbGVkIGluIEFSTSBFQUJJLCBpdCBtdXN0IGJlIGFsaWduZWQgb24gYW4gZXZl bi1udW1iZXJlZCByZWdpc3RlciAocjAsIHIyIG9yIFtzcF0pLgotLy8gVG8gcHJldmVudCB0aGUg YXNzZW1ibGVyIGZyb20gdXNpbmcgd3JvbmcgcmVnaXN0ZXJzLCBsZXQncyBvY2N1cHkgcjEgb3Ig cjMgd2l0aCBhIGR1bW15IGFyZ3VtZW50IHdoZW4gbmVjZXNzYXJ5LgotI2lmIChDT01QSUxFUl9T VVBQT1JUUyhFQUJJKSAmJiBDUFUoQVJNKSkgfHwgQ1BVKE1JUFMpCi0jZGVmaW5lIEVBQklfMzJC SVRfRFVNTVlfQVJHICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMCksCi0jZWxzZQot I2RlZmluZSBFQUJJXzMyQklUX0RVTU1ZX0FSRwotI2VuZGlmCi0KIHZvaWQgQWNjZXNzR2VuZXJh dGlvblJlc3VsdDo6ZHVtcChQcmludFN0cmVhbSYgb3V0KSBjb25zdAogewogICAgIG91dC5wcmlu dChtX2tpbmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhl bHBlcnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKaW5kZXgg YmIyNDhiNjNjMWQ2MzViNGFhM2ZlNDBmZTJhNzRmOTUwYzk3MjRiMi4uMzdkMDIxYWYwYjBiMDUz NTUwNjdhNzI3YzBmYWEwOWVlODc3YjNlNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0ND YWxsSGVscGVycy5oCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogLy8gRW5jb2Rl ZEpTVmFsdWUgaW4gSlNWQUxVRTMyXzY0IGlzIGEgNjQtYml0IGludGVnZXIuIFdoZW4gYmVpbmcg Y29tcGlsZWQgaW4gQVJNIEVBQkksIGl0IG11c3QgYmUgYWxpZ25lZCBldmVuLW51bWJlcmVkIHJl Z2lzdGVyIChyMCwgcjIgb3IgW3NwXSkuCiAvLyBUbyBhdm9pZCBhc3NlbWJsaWVzIGZyb20gdXNp bmcgd3JvbmcgcmVnaXN0ZXJzLCBsZXQncyBvY2N1cHkgcjEgb3IgcjMgd2l0aCBhIGR1bW15IGFy Z3VtZW50IHdoZW4gbmVjZXNzYXJ5LgogI2lmIChDT01QSUxFUl9TVVBQT1JUUyhFQUJJKSAmJiBD UFUoQVJNKSkgfHwgQ1BVKE1JUFMpCi0jZGVmaW5lIEVBQklfMzJCSVRfRFVNTVlfQVJHICAgICAg VHJ1c3RlZEltbTMyKDApLAorI2RlZmluZSBFQUJJXzMyQklUX0RVTU1ZX0FSRyAgICAgIENDYWxs SGVscGVyczo6VHJ1c3RlZEltbTMyKDApLAogI2Vsc2UKICNkZWZpbmUgRUFCSV8zMkJJVF9EVU1N WV9BUkcKICNlbmRpZgpAQCAtNTMsNyArNTMsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIC8vIFRvIGF2 b2lkIHRoaXMsIGxldCdzIG9jY3VweSB0aGUgNHRoIGFyZ3VtZW50IHJlZ2lzdGVyIChyNykgd2l0 aCBhIGR1bW15IGFyZ3VtZW50IHdoZW4gbmVjZXNzYXJ5LiBUaGlzIG11c3Qgb25seSBiZSBkb25l IHdoZW4gdGhlcmUKIC8vIGlzIG5vIG90aGVyIDMyLWJpdCB2YWx1ZSBhcmd1bWVudCBiZWhpbmQg dGhpcyA2NC1iaXQgSlNWYWx1ZS4KICNpZiBDUFUoU0g0KQotI2RlZmluZSBTSDRfMzJCSVRfRFVN TVlfQVJHICAgICAgVHJ1c3RlZEltbTMyKDApLAorI2RlZmluZSBTSDRfMzJCSVRfRFVNTVlfQVJH ICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMCksCiAjZWxzZQogI2RlZmluZSBTSDRf MzJCSVRfRFVNTVlfQVJHCiAjZW5kaWYK