124315 2013-11-13 15:28:36 -0800 Fix the ARM64 build after recent JavaScriptCore changes 2013-11-13 16:42:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes msaboff oldest_to_newest 950414 0 aestes 2013-11-13 15:28:36 -0800 Fix the ARM64 build after recent JavaScriptCore changes 950418 1 216874 aestes 2013-11-13 15:37:23 -0800 Created attachment 216874 Fix the ARM64 build after recent JavaScriptCore changes 950432 2 216874 msaboff 2013-11-13 16:10:11 -0800 Comment on attachment 216874 Fix the ARM64 build after recent JavaScriptCore changes View in context: https://bugs.webkit.org/attachment.cgi?id=216874&action=review r+, make the fixes noted. > Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:539 > + lshift64(dest, shiftAmount, dest); This needs to be rshift64. > Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:544 > + lshift64(dest, imm, dest); This needs to be rshift64. 950436 3 aestes 2013-11-13 16:42:25 -0800 Committed r159261: <http://trac.webkit.org/changeset/159261> 216874 2013-11-13 15:37:23 -0800 2013-11-13 16:10:11 -0800 Fix the ARM64 build after recent JavaScriptCore changes bug-124315-20131113153722.patch text/plain 15452 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZDEwOGRkOWY0MjU5NzljODg3NWJiZmE1OTc2MzhmYzY0MmZhZmVmLi44OWNmYjIzMTFlY2IzNDJk ODUxOTFkMDVhODY1YjRkNGFhOTg4ZDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxMy0xMS0xMyAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CisK KyAgICAgICAgRml4IHRoZSBBUk02NCBidWlsZCBhZnRlciByZWNlbnQgSmF2YVNjcmlwdENvcmUg Y2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI0MzE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QmFzZWQgb24gcGF0Y2hlcyBieSBteXNlbGYsIEZpbGlwIFBpemxvLCBCZW5qYW1pbiBQb3VsYWlu LCBhbmQgTWljaGFlbCBTYWJvZmYuCisKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9KYXZhU2Ny aXB0Q29yZS54Y2NvbmZpZzogSGlkIHRoZSBzeW1ib2wgZm9yCisgICAgICAgIHN0ZDo6YmFkX2Z1 bmN0aW9uX2NhbGwuCisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvajogTWFya2VkCisgICAgICAgIE1hY3JvQXNzZW1ibGVyQVJNNjQuaCBhbmQgQVJNNjRB c3NlbWJsZXIuaCBhcyBQcml2YXRlIGhlYWRlcnMuCisgICAgICAgICogYXNzZW1ibGVyL0FSTTY0 QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpleGVjdXRhYmxlT2Zm c2V0Rm9yKToKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oOiBSZW1v dmVkIEFSTTY0J3MgZXhlY3V0YWJsZUNvcHkoKSwKKyAgICAgICAgd2hpY2ggd2FzIHJlbW92ZWQg ZnJvbSBvdGhlciBhc3NlbWJsZXIgYmFja2VuZHMgaW4gcjE1NzY5MC4KKyAgICAgICAgKEpTQzo6 TWFjcm9Bc3NlbWJsZXJBUk02NDo6c2hvdWxkQmxpbmRGb3JTcGVjaWZpY0FyY2gpOiBBZGRlZC4K KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6bHNoaWZ0NjQpOiBBZGRlZC4KKyAg ICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6bXVsNjQpOiBBZGRlZC4KKyAgICAgICAg KEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6cnNoaWZ0NjQpOiBBZGRlZC4KKyAgICAgICAgKEpT Qzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6Y29udmVydEludDY0VG9Eb3VibGUpOiBBZGRlZC4KKyAg ICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6YnJhbmNoTXVsNjQpOiBBZGRlZC4KKyAg ICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6YnJhbmNoTmVnNjQpOiBBZGRlZC4KKyAg ICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NDo6c2NyYXRjaFJlZ2lzdGVyRm9yQmxpbmRp bmcpOiBBZGRlZC4KKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAg ICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhEaXYpOiBDaGFuZ2VkCisg ICAgICAgIFNwZWN1bGF0ZUludGVnZXJPcGVyYW5kIHRvIFNwZWN1bGF0ZUludDMyT3BlcmFuZCwK KyAgICAgICAgbm9kZUNhbklnbm9yZU5lZ2F0aXZlWmVybygpIHRvIGJ5dGVjb2RlQ2FuSWdub3Jl TmVnYXRpdmVaZXJvKCksIGFuZAorICAgICAgICBub2RlVXNlZEFzTnVtYmVyKCkgdG8gYnl0ZWNv ZGVVc2VzQXNOdW1iZXIoKS4KKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29t cGlsZUFyaXRoTW9kKTogQ2hhbmdlZAorICAgICAgICBub2RlQ2FuSWdub3JlTmVnYXRpdmVaZXJv KCkgdG8gYnl0ZWNvZGVDYW5JZ25vcmVOZWdhdGl2ZVplcm8oKS4KKwogMjAxMy0xMS0xMyAgT2xp dmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBkZWJ1ZyBidWlsZC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9KYXZhU2Ny aXB0Q29yZS54Y2NvbmZpZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9K YXZhU2NyaXB0Q29yZS54Y2NvbmZpZwppbmRleCA1MTI1MDgzZGM0NTBlMmU1M2I2YjU5MTNhYmYz M2QwMGY4YWVhNDYzLi5kYjUwMGM2MzEzZTU1MTczMzEwNjhlMGQwMWM2MmYxMTNhMzYxYTQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ29uZmlndXJhdGlvbnMvSmF2YVNjcmlw dENvcmUueGNjb25maWcKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NvbmZpZ3VyYXRpb25z L0phdmFTY3JpcHRDb3JlLnhjY29uZmlnCkBAIC0zNSw3ICszNSw3IEBAIEpTVkFMVUVfTU9ERUxf cHBjID0gMzJfNjQ7CiBKU1ZBTFVFX01PREVMX3g4Nl82NCA9IDY0OwogCiAvLyBQcmV2ZW50IEMr KyBzdGFuZGFyZCBsaWJyYXJ5IG9wZXJhdG9yIG5ldywgZGVsZXRlIGFuZCB0aGVpciByZWxhdGVk IGV4Y2VwdGlvbiB0eXBlcyBmcm9tIGJlaW5nIGV4cG9ydGVkIGFzIHdlYWsgc3ltYm9scy4KLU9U SEVSX0xERkxBR1NfSElERV9TWU1CT0xTID0gLVdsLC11bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19a VElTdDliYWRfYWxsb2MgLVdsLC11bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19aVElTdDlleGNlcHRp b24gLVdsLC11bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19aVFNTdDliYWRfYWxsb2MgLVdsLC11bmV4 cG9ydGVkX3N5bWJvbCAtV2wsX19aVFNTdDlleGNlcHRpb24gLVdsLC11bmV4cG9ydGVkX3N5bWJv bCAtV2wsX19aZGxQdlNfIC1XbCwtdW5leHBvcnRlZF9zeW1ib2wgLVdsLF9fWm53bVB2IC1XbCwt dW5leHBvcnRlZF9zeW1ib2wgLVdsLF9fWk5LU3QzX18xOGZ1bmN0aW9uSUZ2dkVFY2xFdiAtV2ws LXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pOU3QzX18xOGZ1bmN0aW9uSUZ2dkVFQzFFT1MyXyAt V2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pOU3QzX18xOGZ1bmN0aW9uSUZ2dkVFQzJFT1My XyAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pOS1N0M19fMThmdW5jdGlvbklGdlJOM0pT QzE3Qnl0ZWNvZGVHZW5lcmF0b3JFUE5TMV8xMFJlZ2lzdGVySURFRUVjbEVTM19TNV8gLVdsLC11 bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19aTlN0M19fMThmdW5jdGlvbklGdlJOM0pTQzE3Qnl0ZWNv ZGVHZW5lcmF0b3JFUE5TMV8xMFJlZ2lzdGVySURFRUVEMUV2IC1XbCwtdW5leHBvcnRlZF9zeW1i b2wgLVdsLF9fWk5TdDNfXzE4ZnVuY3Rpb25JRnZSTjNKU0MxN0J5dGVjb2RlR2VuZXJhdG9yRVBO UzFfMTBSZWdpc3RlcklERUVFRDJFdiAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pOU3Qz X18xOGZ1bmN0aW9uSUZ2dkVFRDFFdiAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pOU3Qz X18xOGZ1bmN0aW9uSUZ2dkVFRDJFdiAtV2wsLWFsbF9sb2FkOworT1RIRVJfTERGTEFHU19ISURF X1NZTUJPTFMgPSAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pUSVN0OWJhZF9hbGxvYyAt V2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pUSVN0OWV4Y2VwdGlvbiAtV2wsLXVuZXhwb3J0 ZWRfc3ltYm9sIC1XbCxfX1pUU1N0OWJhZF9hbGxvYyAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1X bCxfX1pUU1N0OWV4Y2VwdGlvbiAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9sIC1XbCxfX1pkbFB2U18g LVdsLC11bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19abndtUHYgLVdsLC11bmV4cG9ydGVkX3N5bWJv bCAtV2wsX19aTktTdDNfXzE4ZnVuY3Rpb25JRnZ2RUVjbEV2IC1XbCwtdW5leHBvcnRlZF9zeW1i b2wgLVdsLF9fWk5TdDNfXzE4ZnVuY3Rpb25JRnZ2RUVDMUVPUzJfIC1XbCwtdW5leHBvcnRlZF9z eW1ib2wgLVdsLF9fWk5TdDNfXzE4ZnVuY3Rpb25JRnZ2RUVDMkVPUzJfIC1XbCwtdW5leHBvcnRl ZF9zeW1ib2wgLVdsLF9fWk5LU3QzX18xOGZ1bmN0aW9uSUZ2Uk4zSlNDMTdCeXRlY29kZUdlbmVy YXRvckVQTlMxXzEwUmVnaXN0ZXJJREVFRWNsRVMzX1M1XyAtV2wsLXVuZXhwb3J0ZWRfc3ltYm9s IC1XbCxfX1pOU3QzX18xOGZ1bmN0aW9uSUZ2Uk4zSlNDMTdCeXRlY29kZUdlbmVyYXRvckVQTlMx XzEwUmVnaXN0ZXJJREVFRUQxRXYgLVdsLC11bmV4cG9ydGVkX3N5bWJvbCAtV2wsX19aTlN0M19f MThmdW5jdGlvbklGdlJOM0pTQzE3Qnl0ZWNvZGVHZW5lcmF0b3JFUE5TMV8xMFJlZ2lzdGVySURF RUVEMkV2IC1XbCwtdW5leHBvcnRlZF9zeW1ib2wgLVdsLF9fWk5TdDNfXzE4ZnVuY3Rpb25JRnZ2 RUVEMUV2IC1XbCwtdW5leHBvcnRlZF9zeW1ib2wgLVdsLF9fWk5TdDNfXzE4ZnVuY3Rpb25JRnZ2 RUVEMkV2IC1XbCwtdW5leHBvcnRlZF9zeW1ib2wgLVdsLF9fWlRWTlN0M19fMTE3YmFkX2Z1bmN0 aW9uX2NhbGxFIC1XbCwtYWxsX2xvYWQ7CiAKIE9USEVSX0xERkxBR1NfQkFTRSA9IC1sb2JqYyAt V2wsLVksMyAkKE9USEVSX0xERkxBR1NfSElERV9TWU1CT0xTKTsKIE9USEVSX0xERkxBR1MgPSAk KGluaGVyaXRlZCkgJChPVEhFUl9MREZMQUdTXyQoUExBVEZPUk1fTkFNRSkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2ogYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCBjODI4YjA1ZTRmMmM3OWNlNTlkNGFiM2ZkYjVlYzlhZmVk MmVlMzVjLi44NzJkNjczN2ZiY2E2NzFhZjEzOGFkM2ExZTkyNjYwMzM2ZmZkZWFhIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtODc4LDYgKzg3OCw4IEBACiAJCUExNzEyQjNCMTFD N0IyMTIwMDdBNTMxNSAvKiBSZWdFeHBDYWNoZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBMTcxMkIzQTExQzdCMjEyMDA3QTUzMTUgLyogUmVnRXhw Q2FjaGUuY3BwICovOyB9OwogCQlBMTcxMkIzRjExQzdCMjI4MDA3QTUzMTUgLyogUmVnRXhwQ2Fj aGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEExNzEy QjNFMTFDN0IyMjgwMDdBNTMxNSAvKiBSZWdFeHBDYWNoZS5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUExNzEyQjQxMTFDN0IyMzUwMDdBNTMxNSAv KiBSZWdFeHBLZXkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEExNzEyQjQwMTFDN0IyMzUwMDdBNTMxNSAvKiBSZWdFeHBLZXkuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OworCQlBMUEwMDlDMDE4MzFBMjJEMDBD Rjg3MTEgLyogTWFjcm9Bc3NlbWJsZXJBUk02NC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gODY0MDkyM0MxNTZFRUQzQjAwNTY2Q0IyIC8qIE1hY3JvQXNz ZW1ibGVyQVJNNjQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OworCQlBMUEwMDlDMTE4MzFBMjZFMDBDRjg3MTEgLyogQVJNNjRBc3NlbWJsZXIuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDg2NDA5MjNCMTU2RUVE M0IwMDU2NkNCMiAvKiBBUk02NEFzc2VtYmxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVT ID0gKFByaXZhdGUsICk7IH07IH07CiAJCUE3MDA4NzM5MTdDQkU4NTMwMEMzRTY0MyAvKiBNYXBD b25zdHJ1Y3Rvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBBNzAwODczNzE3Q0JFODUzMDBDM0U2NDMgLyogTWFwQ29uc3RydWN0b3IuY3BwICovOyB9 OwogCQlBNzAwODczQTE3Q0JFODUzMDBDM0U2NDMgLyogTWFwQ29uc3RydWN0b3IuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3MDA4NzM4MTdDQkU4NTMw MEMzRTY0MyAvKiBNYXBDb25zdHJ1Y3Rvci5oICovOyB9OwogCQlBNzAwODczRDE3Q0JFOEQzMDBD M0U2NDMgLyogTWFwUHJvdG90eXBlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IEE3MDA4NzNCMTdDQkU4RDMwMEMzRTY0MyAvKiBNYXBQcm90b3R5cGUu Y3BwICovOyB9OwpAQCAtNDI2NCw2ICs0MjY2LDcgQEAKIAkJCQlBNzBCMDgzMzE3QTBCNzlCMDBE QUYxNEIgLyogREZHQmluYXJ5U3dpdGNoLmggaW4gSGVhZGVycyAqLywKIAkJCQlBN0Q4OUNGNDE3 QTBCOENDMDA3NzNBRDggLyogREZHQmxvY2tJbnNlcnRpb25TZXQuaCBpbiBIZWFkZXJzICovLAog CQkJCTBGODM2NEI3MTY0QjBDMTEwMDUzMzI5QSAvKiBERkdCcmFuY2hEaXJlY3Rpb24uaCBpbiBI ZWFkZXJzICovLAorCQkJCUExQTAwOUMwMTgzMUEyMkQwMENGODcxMSAvKiBNYWNyb0Fzc2VtYmxl ckFSTTY0LmggaW4gSGVhZGVycyAqLywKIAkJCQk4NkVDOURDNTEzMjhERjgyMDAyQjJBRDcgLyog REZHQnl0ZUNvZGVQYXJzZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCTBGMjU2QzM2MTYyN0IwQUQw MDdGMjc4MyAvKiBERkdDYWxsQXJyYXlBbGxvY2F0b3JTbG93UGF0aEdlbmVyYXRvci5oIGluIEhl YWRlcnMgKi8sCiAJCQkJMEY3QjI5NEIxNEMzQ0QyRjAwN0MzREIxIC8qIERGR0NhcGFiaWxpdGll cy5oIGluIEhlYWRlcnMgKi8sCkBAIC00Njc5LDYgKzQ2ODIsNyBAQAogCQkJCUUxMjRBOEY3MEU1 NTU3NzUwMDMwOTFGMSAvKiBPcGFxdWVKU1N0cmluZy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTY5 QTA3OUIwRUQxRDNBRTAwRjFGNjgxIC8qIE9wY29kZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMEYy QkRDMkMxNTFGREU5MTAwQ0Q4OTEwIC8qIE9wZXJhbmRzLmggaW4gSGVhZGVycyAqLywKKwkJCQlB MUEwMDlDMTE4MzFBMjZFMDBDRjg3MTEgLyogQVJNNjRBc3NlbWJsZXIuaCBpbiBIZWFkZXJzICov LAogCQkJCUE3MDQ0N0VBMTdBMEJENDYwMEY1ODk4RSAvKiBPcGVyYW5kc0lubGluZXMuaCBpbiBI ZWFkZXJzICovLAogCQkJCUJDMThDNDQ4MEUxNkY1Q0QwMEIzNDQ2MCAvKiBPcGVyYXRpb25zLmgg aW4gSGVhZGVycyAqLywKIAkJCQkwRkUyMjhFRDE0MzZBQjI3MDAxOTZDNDggLyogT3B0aW9ucy5o IGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0FSTTY0QXNzZW1ibGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FS TTY0QXNzZW1ibGVyLmgKaW5kZXggMTFiYTE3MTNlNThmOTQ2OTIzNjkwYzg2MmMwNjAyNjhkY2Ri NjgxNC4uNTNiZWJlZWQ1NTBiMjhhZWI1NTk0ZjM0MWUyMDQxYjczYjZiYWQ4ZSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNNjRBc3NlbWJsZXIuaApAQCAtMjQ5 NSwxMSArMjQ5NSw2IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICBy ZXR1cm4gc3RhdGljX2Nhc3Q8aW50MzJfdCo+KG1fYnVmZmVyLmRhdGEoKSlbbG9jYXRpb24gLyBz aXplb2YoaW50MzJfdCkgLSAxXTsKICAgICB9Ci0gICAgCi0gICAgUGFzc1JlZlB0cjxFeGVjdXRh YmxlTWVtb3J5SGFuZGxlPiBleGVjdXRhYmxlQ29weShWTSYgdm0sIHZvaWQqIG93bmVyVUlELCBK SVRDb21waWxhdGlvbkVmZm9ydCBlZmZvcnQpCi0gICAgewotICAgICAgICByZXR1cm4gbV9idWZm ZXIuZXhlY3V0YWJsZUNvcHkodm0sIG93bmVyVUlELCBlZmZvcnQpOwotICAgIH0KIAogICAgIHZv aWQqIHVubGlua2VkQ29kZSgpIHsgcmV0dXJuIG1fYnVmZmVyLmRhdGEoKTsgfQogICAgIHNpemVf dCBjb2RlU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fYnVmZmVyLmNvZGVTaXplKCk7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02 NC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0 LmgKaW5kZXggYjU2YWI3MTQyM2M0ZmMyZTYyMGRjYjQxZTE4NWRlZDM3ZTRmNDA5Ni4uM2JmMWYx NGIyMzA4YjdiYmE3MjlmMGRkOWY1ZTQ1ZThmNWYzZTYzZCAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgKQEAgLTEyNyw2 ICsxMjcsMTAgQEAgcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBSZWdpc3RlcklEIGZyYW1lUG9p bnRlclJlZ2lzdGVyID0gQVJNNjRSZWdpc3RlcnM6OmZwOwogICAgIHN0YXRpYyBjb25zdCBSZWdp c3RlcklEIGxpbmtSZWdpc3RlciA9IEFSTTY0UmVnaXN0ZXJzOjpscjsKIAorICAgIC8vIEZJWE1F OiBHZXQgcmVhc29uYWJsZSBpbXBsZW1lbnRhdGlvbnMgZm9yIHRoZXNlCisgICAgc3RhdGljIGJv b2wgc2hvdWxkQmxpbmRGb3JTcGVjaWZpY0FyY2godWludDMyX3QgdmFsdWUpIHsgcmV0dXJuIHZh bHVlID49IDB4MDBmZmZmZmY7IH0KKyAgICBzdGF0aWMgYm9vbCBzaG91bGRCbGluZEZvclNwZWNp ZmljQXJjaCh1aW50NjRfdCB2YWx1ZSkgeyByZXR1cm4gdmFsdWUgPj0gMHgwMGZmZmZmZjsgfQor ICAgIHN0YXRpYyBib29sIHNob3VsZEJsaW5kRm9yU3BlY2lmaWNBcmNoKHVpbnRwdHJfdCB2YWx1 ZSkgeyByZXR1cm4gdmFsdWUgPj0gMHgwMGZmZmZmZjsgfQogCiAgICAgLy8gSW50ZWdlciBvcGVy YXRpb25zOgogCkBAIC0zNzMsMTAgKzM3NywzNSBAQCBwdWJsaWM6CiAgICAgICAgIGxzaGlmdDMy KGRlc3QsIGltbSwgZGVzdCk7CiAgICAgfQogCisgICAgdm9pZCBsc2hpZnQ2NChSZWdpc3RlcklE IHNyYywgUmVnaXN0ZXJJRCBzaGlmdEFtb3VudCwgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAg ICAgICAgbV9hc3NlbWJsZXIubHNsPDY0PihkZXN0LCBzcmMsIHNoaWZ0QW1vdW50KTsKKyAgICB9 CisKKyAgICB2b2lkIGxzaGlmdDY0KFJlZ2lzdGVySUQgc3JjLCBUcnVzdGVkSW1tMzIgaW1tLCBS ZWdpc3RlcklEIGRlc3QpCisgICAgeworICAgICAgICBtX2Fzc2VtYmxlci5sc2w8NjQ+KGRlc3Qs IHNyYywgaW1tLm1fdmFsdWUgJiAweDNmKTsKKyAgICB9CisKKyAgICB2b2lkIGxzaGlmdDY0KFJl Z2lzdGVySUQgc2hpZnRBbW91bnQsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIGxz aGlmdDY0KGRlc3QsIHNoaWZ0QW1vdW50LCBkZXN0KTsKKyAgICB9CisKKyAgICB2b2lkIGxzaGlm dDY0KFRydXN0ZWRJbW0zMiBpbW0sIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIGxz aGlmdDY0KGRlc3QsIGltbSwgZGVzdCk7CisgICAgfQorICAgIAogICAgIHZvaWQgbXVsMzIoUmVn aXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVy Lm11bDwzMj4oZGVzdCwgZGVzdCwgc3JjKTsKICAgICB9CisgICAgCisgICAgdm9pZCBtdWw2NChS ZWdpc3RlcklEIHNyYywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgbV9hc3NlbWJs ZXIubXVsPDY0PihkZXN0LCBkZXN0LCBzcmMpOworICAgIH0KIAogICAgIHZvaWQgbXVsMzIoVHJ1 c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CkBA IC00OTQsNiArNTIzLDI2IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJzaGlmdDMyKGRlc3Qs IGltbSwgZGVzdCk7CiAgICAgfQorICAgIAorICAgIHZvaWQgcnNoaWZ0NjQoUmVnaXN0ZXJJRCBz cmMsIFJlZ2lzdGVySUQgc2hpZnRBbW91bnQsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAg ICAgIG1fYXNzZW1ibGVyLmxzcjw2ND4oZGVzdCwgc3JjLCBzaGlmdEFtb3VudCk7CisgICAgfQor ICAgIAorICAgIHZvaWQgcnNoaWZ0NjQoUmVnaXN0ZXJJRCBzcmMsIFRydXN0ZWRJbW0zMiBpbW0s IFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIG1fYXNzZW1ibGVyLmxzcjw2ND4oZGVz dCwgc3JjLCBpbW0ubV92YWx1ZSAmIDB4M2YpOworICAgIH0KKyAgICAKKyAgICB2b2lkIHJzaGlm dDY0KFJlZ2lzdGVySUQgc2hpZnRBbW91bnQsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAg ICAgIGxzaGlmdDY0KGRlc3QsIHNoaWZ0QW1vdW50LCBkZXN0KTsKKyAgICB9CisgICAgCisgICAg dm9pZCByc2hpZnQ2NChUcnVzdGVkSW1tMzIgaW1tLCBSZWdpc3RlcklEIGRlc3QpCisgICAgewor ICAgICAgICBsc2hpZnQ2NChkZXN0LCBpbW0sIGRlc3QpOworICAgIH0KIAogICAgIHZvaWQgc3Vi MzIoUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CkBAIC0xMTg3LDYgKzEy MzYsMTEgQEAgcHVibGljOgogICAgICAgICBjb252ZXJ0SW50MzJUb0RvdWJsZShkYXRhVGVtcFJl Z2lzdGVyLCBkZXN0KTsKICAgICB9CiAgICAgCisgICAgdm9pZCBjb252ZXJ0SW50NjRUb0RvdWJs ZShSZWdpc3RlcklEIHNyYywgRlBSZWdpc3RlcklEIGRlc3QpCisgICAgeworICAgICAgICBtX2Fz c2VtYmxlci5zY3Z0Zjw2NCwgNjQ+KGRlc3QsIHNyYyk7CisgICAgfQorICAgIAogICAgIHZvaWQg ZGl2RG91YmxlKEZQUmVnaXN0ZXJJRCBzcmMsIEZQUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAg ICAgICAgZGl2RG91YmxlKGRlc3QsIHNyYywgZGVzdCk7CkBAIC0xODI4LDEyICsxODgyLDQxIEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGJyYW5jaE11bDMyKGNvbmQsIGRhdGFUZW1wUmVnaXN0 ZXIsIHNyYywgZGVzdCk7CiAgICAgfQogCisgICAgSnVtcCBicmFuY2hNdWw2NChSZXN1bHRDb25k aXRpb24gY29uZCwgUmVnaXN0ZXJJRCBzcmMxLCBSZWdpc3RlcklEIHNyYzIsIFJlZ2lzdGVySUQg ZGVzdCkKKyAgICB7CisgICAgICAgIEFTU0VSVChjb25kICE9IFNpZ25lZCk7CisKKyAgICAgICAg Ly8gVGhpcyBpcyBhIHNpZ25lZCBtdWx0aXBsZSBvZiB0d28gNjQtYml0IHZhbHVlcywgcHJvZHVj aW5nIGEgNjQtYml0IHJlc3VsdC4KKyAgICAgICAgbV9hc3NlbWJsZXIubXVsPDY0PihkZXN0LCBz cmMxLCBzcmMyKTsKKworICAgICAgICBpZiAoY29uZCAhPSBPdmVyZmxvdykKKyAgICAgICAgICAg IHJldHVybiBicmFuY2hUZXN0NjQoY29uZCwgZGVzdCk7CisKKyAgICAgICAgLy8gQ29tcHV0ZSBi aXRzIDEyNy4uNjQgb2YgdGhlIHJlc3VsdCBpbnRvIGRhdGFUZW1wUmVnaXN0ZXIuCisgICAgICAg IG1fYXNzZW1ibGVyLnNtdWxoKGdldENhY2hlZERhdGFUZW1wUmVnaXN0ZXJJREFuZEludmFsaWRh dGUoKSwgc3JjMSwgc3JjMik7CisgICAgICAgIC8vIFNwbGF0IGJpdCA2MyBvZiB0aGUgcmVzdWx0 IHRvIGJpdHMgNjMuLjAgb2YgbWVtb3J5VGVtcFJlZ2lzdGVyLgorICAgICAgICBtX2Fzc2VtYmxl ci5hc3I8NjQ+KGdldENhY2hlZE1lbW9yeVRlbXBSZWdpc3RlcklEQW5kSW52YWxpZGF0ZSgpLCBk ZXN0LCA2Myk7CisgICAgICAgIC8vIENoZWNrIHRoYXQgYml0cyAzMS4uNjMgb2YgdGhlIG9yaWdp bmFsIHJlc3VsdCB3ZXJlIGFsbCBlcXVhbC4KKyAgICAgICAgcmV0dXJuIGJyYW5jaDY0KE5vdEVx dWFsLCBtZW1vcnlUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIpOworICAgIH0KKworICAg IEp1bXAgYnJhbmNoTXVsNjQoUmVzdWx0Q29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgc3JjLCBS ZWdpc3RlcklEIGRlc3QpCisgICAgeworICAgICAgICByZXR1cm4gYnJhbmNoTXVsNjQoY29uZCwg ZGVzdCwgc3JjLCBkZXN0KTsKKyAgICB9CisKICAgICBKdW1wIGJyYW5jaE5lZzMyKFJlc3VsdENv bmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxl ci5uZWc8MzIsIFM+KGRlc3QsIGRlc3QpOwogICAgICAgICByZXR1cm4gSnVtcChtYWtlQnJhbmNo KGNvbmQpKTsKICAgICB9CiAKKyAgICBKdW1wIGJyYW5jaE5lZzY0KFJlc3VsdENvbmRpdGlvbiBj b25kLCBSZWdpc3RlcklEIHNyY0Rlc3QpCisgICAgeworICAgICAgICBtX2Fzc2VtYmxlci5uZWc8 NjQsIFM+KHNyY0Rlc3QsIHNyY0Rlc3QpOworICAgICAgICByZXR1cm4gSnVtcChtYWtlQnJhbmNo KGNvbmQpKTsKKyAgICB9CisKICAgICBKdW1wIGJyYW5jaFN1YjMyKFJlc3VsdENvbmRpdGlvbiBj b25kLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5uZWc8MzIs IFM+KGRlc3QsIGRlc3QpOwpAQCAtMjE5MCw2ICsyMjczLDggQEAgcHVibGljOgogICAgICAgICBy ZXR1cm4gQVJNNjRBc3NlbWJsZXI6Om1heEp1bXBSZXBsYWNlbWVudFNpemUoKTsKICAgICB9CiAK KyAgICBSZWdpc3RlcklEIHNjcmF0Y2hSZWdpc3RlckZvckJsaW5kaW5nKCkgeyByZXR1cm4gZ2V0 Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklEQW5kSW52YWxpZGF0ZSgpOyB9CisKICAgICBzdGF0aWMg Ym9vbCBjYW5KdW1wUmVwbGFjZVBhdGNoYWJsZUJyYW5jaFB0cldpdGhQYXRjaCgpIHsgcmV0dXJu IGZhbHNlOyB9CiAgICAgCiAgICAgc3RhdGljIENvZGVMb2NhdGlvbkxhYmVsIHN0YXJ0T2ZCcmFu Y2hQdHJXaXRoUGF0Y2hPblJlZ2lzdGVyKENvZGVMb2NhdGlvbkRhdGFMYWJlbFB0ciBsYWJlbCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKaW5k ZXggMzE2NmFjODBmOGIyNTFiYTlkNzRhMDY3NWZiZGM0NzZmMzNiODg1Mi4uNGM2ZmUyNjFjY2Ez ZDlkYzBlNjkzZTVjMzNlMTRhY2ZlOTRkNGFmZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKQEAgLTM0NzksOCArMzQ3OSw4IEBAIHZvaWQg U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcml0aERpdihOb2RlKiBub2RlKQogCiAgICAgICAgIGlu dDMyUmVzdWx0KHF1b3RpZW50LmdwcigpLCBub2RlKTsKICNlbGlmIENQVShBUk02NCkKLSAgICAg ICAgU3BlY3VsYXRlSW50ZWdlck9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKLSAg ICAgICAgU3BlY3VsYXRlSW50ZWdlck9wZXJhbmQgb3AyKHRoaXMsIG5vZGUtPmNoaWxkMigpKTsK KyAgICAgICAgU3BlY3VsYXRlSW50MzJPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7 CisgICAgICAgIFNwZWN1bGF0ZUludDMyT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkp OwogICAgICAgICBHUFJSZWcgb3AxR1BSID0gb3AxLmdwcigpOwogICAgICAgICBHUFJSZWcgb3Ay R1BSID0gb3AyLmdwcigpOwogICAgICAgICBHUFJUZW1wb3JhcnkgcXVvdGllbnQodGhpcyk7CkBA IC0zNDg4LDcgKzM0ODgsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhEaXYo Tm9kZSogbm9kZSkKIAogICAgICAgICAvLyBJZiB0aGUgdXNlciBjYXJlcyBhYm91dCBuZWdhdGl2 ZSB6ZXJvLCB0aGVuIHNwZWN1bGF0ZSB0aGF0IHdlJ3JlIG5vdCBhYm91dAogICAgICAgICAvLyB0 byBwcm9kdWNlIG5lZ2F0aXZlIHplcm8uCi0gICAgICAgIGlmICghbm9kZUNhbklnbm9yZU5lZ2F0 aXZlWmVybyhub2RlLT5hcml0aE5vZGVGbGFncygpKSkgeworICAgICAgICBpZiAoIWJ5dGVjb2Rl Q2FuSWdub3JlTmVnYXRpdmVaZXJvKG5vZGUtPmFyaXRoTm9kZUZsYWdzKCkpKSB7CiAgICAgICAg ICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcCBudW1lcmF0b3JOb25aZXJvID0gbV9qaXQuYnJhbmNo VGVzdDMyKE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCBvcDFHUFIpOwogICAgICAgICAgICAgc3Bl Y3VsYXRpb25DaGVjayhOZWdhdGl2ZVplcm8sIEpTVmFsdWVSZWdzKCksIDAsIG1faml0LmJyYW5j aDMyKE1hY3JvQXNzZW1ibGVyOjpMZXNzVGhhbiwgb3AyR1BSLCBUcnVzdGVkSW1tMzIoMCkpKTsK ICAgICAgICAgICAgIG51bWVyYXRvck5vblplcm8ubGluaygmbV9qaXQpOwpAQCAtMzQ5OCw3ICsz NDk4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUFyaXRoRGl2KE5vZGUqIG5vZGUp CiAKICAgICAgICAgLy8gQ2hlY2sgdGhhdCB0aGVyZSB3YXMgbm8gcmVtYWluZGVyLiBJZiB0aGVy ZSBoYWQgYmVlbiwgdGhlbiB3ZSdkIGJlIG9ibGlnYXRlZCB0bwogICAgICAgICAvLyBwcm9kdWNl IGEgZG91YmxlIHJlc3VsdCBpbnN0ZWFkLgotICAgICAgICBpZiAobm9kZVVzZWRBc051bWJlcihu b2RlLT5hcml0aE5vZGVGbGFncygpKSkgeworICAgICAgICBpZiAoYnl0ZWNvZGVVc2VzQXNOdW1i ZXIobm9kZS0+YXJpdGhOb2RlRmxhZ3MoKSkpIHsKICAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hl Y2soT3ZlcmZsb3csIEpTVmFsdWVSZWdzKCksIDAsIG1faml0LmJyYW5jaE11bDMyKEpJVENvbXBp bGVyOjpPdmVyZmxvdywgcXVvdGllbnQuZ3ByKCksIG9wMkdQUiwgbXVsdGlwbHlBbnN3ZXIuZ3By KCkpKTsKICAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soT3ZlcmZsb3csIEpTVmFsdWVSZWdz KCksIDAsIG1faml0LmJyYW5jaDMyKEpJVENvbXBpbGVyOjpOb3RFcXVhbCwgbXVsdGlwbHlBbnN3 ZXIuZ3ByKCksIG9wMUdQUikpOwogICAgICAgICB9CkBAIC0zNzcwLDcgKzM3NzAsNyBAQCB2b2lk IFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhNb2QoTm9kZSogbm9kZSkKIAogICAgICAgICAv LyBJZiB0aGUgdXNlciBjYXJlcyBhYm91dCBuZWdhdGl2ZSB6ZXJvLCB0aGVuIHNwZWN1bGF0ZSB0 aGF0IHdlJ3JlIG5vdCBhYm91dAogICAgICAgICAvLyB0byBwcm9kdWNlIG5lZ2F0aXZlIHplcm8u Ci0gICAgICAgIGlmICghbm9kZUNhbklnbm9yZU5lZ2F0aXZlWmVybyhub2RlLT5hcml0aE5vZGVG bGFncygpKSkgeworICAgICAgICBpZiAoIWJ5dGVjb2RlQ2FuSWdub3JlTmVnYXRpdmVaZXJvKG5v ZGUtPmFyaXRoTm9kZUZsYWdzKCkpKSB7CiAgICAgICAgICAgICAvLyBDaGVjayB0aGF0IHdlJ3Jl IG5vdCBhYm91dCB0byBjcmVhdGUgbmVnYXRpdmUgemVyby4KICAgICAgICAgICAgIEpJVENvbXBp bGVyOjpKdW1wIG51bWVyYXRvclBvc2l0aXZlID0gbV9qaXQuYnJhbmNoMzIoSklUQ29tcGlsZXI6 OkdyZWF0ZXJUaGFuT3JFcXVhbCwgZGl2aWRlbmRHUFIsIFRydXN0ZWRJbW0zMigwKSk7CiAgICAg ICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKE92ZXJmbG93LCBKU1ZhbHVlUmVncygpLCAwLCBtX2pp dC5icmFuY2hUZXN0MzIoSklUQ29tcGlsZXI6Olplcm8sIHF1b3RpZW50VGhlblJlbWFpbmRlckdQ UikpOwo=