125472 2013-12-09 16:00:10 -0800 ASSERT !heap.vm()->isInitializingObject() when finishing DFG compilation at beginning of GC 2013-12-10 11:34:31 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg buildbot eflews.bot gyuyoung.kim philn rniwa xan.lopez oldest_to_newest 958124 0 mhahnenberg 2013-12-09 16:00:10 -0800 We already assume that we might do some allocation during DFG plan finalization, so we just need to flip the proper bits so that the ASSERT doesn't fire in this situation. 958138 1 218812 mhahnenberg 2013-12-09 16:44:34 -0800 Created attachment 218812 Patch 958141 2 218812 eflews.bot 2013-12-09 16:52:10 -0800 Comment on attachment 218812 Patch Attachment 218812 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/47238202 958143 3 218812 eflews.bot 2013-12-09 16:59:00 -0800 Comment on attachment 218812 Patch Attachment 218812 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/45888244 958146 4 218812 buildbot 2013-12-09 17:16:59 -0800 Comment on attachment 218812 Patch Attachment 218812 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/47248248 958149 5 218812 buildbot 2013-12-09 17:28:02 -0800 Comment on attachment 218812 Patch Attachment 218812 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/47288220 958152 6 218812 buildbot 2013-12-09 17:28:24 -0800 Comment on attachment 218812 Patch Attachment 218812 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/47228237 958161 7 218819 mhahnenberg 2013-12-09 18:45:22 -0800 Created attachment 218819 Patch 958181 8 218819 eflews.bot 2013-12-09 20:45:23 -0800 Comment on attachment 218819 Patch Attachment 218819 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/46278321 958192 9 218819 ggaren 2013-12-09 21:18:56 -0800 Comment on attachment 218819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218819&action=review r=me > Source/JavaScriptCore/heap/Heap.cpp:759 > + PretendAllocationOkay pretend(*this); I don't like the word "pretend" here because it implies that we're only silencing ASSERTs, when in reality we're making material changes that make the difference between allocating being OK or not. How about "RecursiveAllocationScope"? > Source/JavaScriptCore/heap/Heap.cpp:760 > + m_vm->prepareToDiscardCode(); Do we need to do this in every GC, or only if we're going to discard code? Seems weird, and unnecessarily costly, to do this if we're not going to discard code. 958374 10 218819 mhahnenberg 2013-12-10 08:25:45 -0800 Comment on attachment 218819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218819&action=review >> Source/JavaScriptCore/heap/Heap.cpp:759 >> + PretendAllocationOkay pretend(*this); > > I don't like the word "pretend" here because it implies that we're only silencing ASSERTs, when in reality we're making material changes that make the difference between allocating being OK or not. How about "RecursiveAllocationScope"? OK. >> Source/JavaScriptCore/heap/Heap.cpp:760 >> + m_vm->prepareToDiscardCode(); > > Do we need to do this in every GC, or only if we're going to discard code? Seems weird, and unnecessarily costly, to do this if we're not going to discard code. I think this is an unfortunately named method. We have an invariant right now that there can be no concurrent compilation going on during garbage collection, which is what "prepareToDiscardCode()" enforces, i.e. it finishes any remaining compilation work which then prevents any further concurrent compilation. I don't think this invariant is only related to discarding code. There are lots of assumptions in how concurrent compilation works that are built on top of the fact that a GC absolutely cannot occur in the middle of a compilation. For example, I believe LUB-ing of value profiles, array profiles, etc. depend on the fact that the object they grab from the profile is not a stale reference to a dead object. 958433 11 mhahnenberg 2013-12-10 11:34:31 -0800 Committed r160377: <http://trac.webkit.org/changeset/160377> 218812 2013-12-09 16:44:34 -0800 2013-12-09 18:45:20 -0800 Patch bug-125472-20131209164429.patch text/plain 9460 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwMzQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDEzLTEyLTA5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgQVNTRVJUICFoZWFwLnZtKCktPmlzSW5pdGlhbGl6aW5nT2JqZWN0KCkgd2hlbiBm aW5pc2hpbmcgREZHIGNvbXBpbGF0aW9uIGF0IGJlZ2lubmluZyBvZiBHQworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NDcyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBsb29rIGxpa2UgaXQn cyBva2F5IHRvIGFsbG9jYXRlIHNvIHRoYXQgdGhlIERGRyBwbGFuIGZpbmFsaXphdGlvbiBzdHVm ZiBjYW4gZG8gd2hhdCBpdCAKKyAgICAgICAgbmVlZHMgdG8gZG8uIFdlIGFscmVhZHkgZXhwZWN0 ZWQgdGhhdCB3ZSBtaWdodCBkbyBhbGxvY2F0aW9uIGR1cmluZyBwbGFuIGZpbmFsaXphdGlvbiBh bmQgd2UgCisgICAgICAgIGluY3JlYXNlZCB0aGUgZGVmZXJyYWwgZGVwdGggdG8gaGFuZGxlIHRo aXMsIGJ1dCB3ZSBuZWVkIHRvIGZpeCB0aGlzIG90aGVyIEFTU0VSVCBzdHVmZiB0b28uCisKKyAg ICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAg ICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6OkhlYXA6OmNvbGxlY3QpOgorICAgICAg ICAqIGhlYXAvSGVhcC5oOgorICAgICAgICAqIGhlYXAvUHJldGVuZEFsbG9jYXRpb25Pa2F5Lmg6 IEFkZGVkLgorICAgICAgICAoSlNDOjpQcmV0ZW5kQWxsb2NhdGlvbk9rYXk6OlByZXRlbmRBbGxv Y2F0aW9uT2theSk6CisgICAgICAgIChKU0M6OlByZXRlbmRBbGxvY2F0aW9uT2theTo6flByZXRl bmRBbGxvY2F0aW9uT2theSk6CisgICAgICAgICogcnVudGltZS9WTS5oOgorCiAyMDEzLTEyLTA5 ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IG1pc2NlbGxhbmVvdXMgdW5uZWNlc3NhcnkgYnVpbGQgc3RhdGVtZW50cwpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDE2MDM0MCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5n IGNvcHkpCkBAIC03MTksNiArNzE5LDcgQEAKIAkJMkE0OEQxOTExNzcyMzY1QjAwQzY1QTVGIC8q IEFQSUNhbGxiYWNrRnVuY3Rpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEMyMTFCNTc0MTc2QTIyNEQwMDBFMkEyMyAvKiBBUElDYWxsYmFja0Z1bmN0 aW9uLmggKi87IH07CiAJCTJBNkY0NjI2MTdFOTU5Q0UwMEM0NUM5OCAvKiBIZWFwT3BlcmF0aW9u LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyQTZGNDYy NTE3RTk1OUNFMDBDNDVDOTggLyogSGVhcE9wZXJhdGlvbi5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTJBN0E1OEVGMTgwOEE0QzQwMDIwQkRGNyAv KiBEZWZlckdDLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDJBN0E1OEVFMTgwOEE0QzQwMDIwQkRGNyAvKiBEZWZlckdDLmNwcCAqLzsgfTsKKwkJMkFB RDk2NEExODU2OTQxNzAwMUY5M0JFIC8qIFByZXRlbmRBbGxvY2F0aW9uT2theS5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkFBRDk2NDkxODU2OTQxNzAw MUY5M0JFIC8qIFByZXRlbmRBbGxvY2F0aW9uT2theS5oICovOyB9OwogCQkyQUQ4OTMyQjE3RTM4 NjhGMDA2NjgyNzYgLyogSGVhcEl0ZXJhdGlvblNjb3BlLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyQUQ4OTMyOTE3RTM4NjhGMDA2NjgyNzYgLyogSGVh cEl0ZXJhdGlvblNjb3BlLmggKi87IH07CiAJCTM3MUQ4NDJEMTdDOThCNkUwMEVDRjk5NCAvKiBs aWJ6LmR5bGliIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMzcxRDg0MkMxN0M5OEI2RTAwRUNGOTk0IC8qIGxpYnouZHlsaWIgKi87IH07CiAJCTQxMzU5 Q0YzMEZERDg5QUQwMDIwNjE4MCAvKiBEYXRlQ29udmVyc2lvbi5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRDIxMjAyMjkwQUQ0MzEwQzAwRUQ3OUI2IC8q IERhdGVDb252ZXJzaW9uLmggKi87IH07CkBAIC0xOTk1LDYgKzE5OTYsNyBAQAogCQkyQTI4MjVD RjE4MzQxRjJEMDA4N0ZCQTkgLyogRGVsYXllZFJlbGVhc2VTY29wZS5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBEZWxheWVkUmVsZWFzZVNjb3BlLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTJBNkY0NjI1MTdFOTU5Q0UwMEM0NUM5OCAvKiBIZWFwT3BlcmF0aW9u LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhlYXBPcGVyYXRpb24uaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkE3QTU4RUUxODA4QTRDNDAwMjBCREY3IC8qIERl ZmVyR0MuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRGVmZXJHQy5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTJBQUQ5NjQ5MTg1Njk0MTcwMDFGOTNC RSAvKiBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gUHJldGVuZEFsbG9jYXRpb25Pa2F5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTJBRDg5MzI5MTdFMzg2OEYwMDY2ODI3NiAvKiBIZWFwSXRlcmF0aW9uU2NvcGUuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSGVhcEl0ZXJhdGlvblNjb3BlLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTM3MUQ4NDJDMTdDOThCNkUwMEVDRjk5NCAvKiBsaWJ6 LmR5bGliICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g ImNvbXBpbGVkLm1hY2gtby5keWxpYiI7IG5hbWUgPSBsaWJ6LmR5bGliOyBwYXRoID0gdXNyL2xp Yi9saWJ6LmR5bGliOyBzb3VyY2VUcmVlID0gU0RLUk9PVDsgfTsKIAkJNDQ5MDk3RUUwRjhGODFC NTAwNzZBMzI3IC8qIEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2Nv bmZpZzsgcGF0aCA9IEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpAQCAtMzE0NSw2ICszMTQ3LDcgQEAKIAkJCQkwRkM4MTUwODE0MDQzQkNBMDBDRkE2 MDMgLyogV3JpdGVCYXJyaWVyU3VwcG9ydC5jcHAgKi8sCiAJCQkJMEZDODE1MDkxNDA0M0JEMjAw Q0ZBNjAzIC8qIFdyaXRlQmFycmllclN1cHBvcnQuaCAqLywKIAkJCQkyQTI4MjVDRjE4MzQxRjJE MDA4N0ZCQTkgLyogRGVsYXllZFJlbGVhc2VTY29wZS5oICovLAorCQkJCTJBQUQ5NjQ5MTg1Njk0 MTcwMDFGOTNCRSAvKiBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkuaCAqLywKIAkJCSk7CiAJCQlwYXRo ID0gaGVhcDsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC00NjE5LDYgKzQ2MjIsNyBA QAogCQkJCTBGMkI2NkVBMTdCNkI1QUIwMEE3QUUzRiAvKiBKU0FycmF5QnVmZmVyVmlld0lubGlu ZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCUE3QkRBRUNCMTdGNEVBMTQwMEY2MTQwQyAvKiBKU0Fy cmF5SXRlcmF0b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDMThDNDE4MEUxNkY1Q0QwMEIzNDQ2 MCAvKiBKU0Jhc2UuaCBpbiBIZWFkZXJzICovLAorCQkJCTJBQUQ5NjRBMTg1Njk0MTcwMDFGOTNC RSAvKiBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkuaCBpbiBIZWFkZXJzICovLAogCQkJCTE0MEQxN0Q3 MEU4QUQ0QTkwMDBDRDE3RCAvKiBKU0Jhc2VQcml2YXRlLmggaW4gSGVhZGVycyAqLywKIAkJCQk4 NkZBOUU5MjE0MkJCQjJFMDAxNzczQjcgLyogSlNCb3VuZEZ1bmN0aW9uLmggaW4gSGVhZGVycyAq LywKIAkJCQlCQzE4QzQxOTBFMTZGNUNEMDBCMzQ0NjAgLyogSlNDYWxsYmFja0NvbnN0cnVjdG9y LmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCShy ZXZpc2lvbiAxNjAzNDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzUsMTMgKzM1LDE0IEBACiAjaW5jbHVkZSAiSGVhcFN0YXRpc3Rp Y3MuaCIKICNpbmNsdWRlICJJbmNyZW1lbnRhbFN3ZWVwZXIuaCIKICNpbmNsdWRlICJJbnRlcnBy ZXRlci5oIgotI2luY2x1ZGUgIlZNLmgiCiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNp bmNsdWRlICJKU0xvY2suaCIKICNpbmNsdWRlICJKU09OT2JqZWN0LmgiCiAjaW5jbHVkZSAiT3Bl cmF0aW9ucy5oIgorI2luY2x1ZGUgIlByZXRlbmRBbGxvY2F0aW9uT2theS5oIgogI2luY2x1ZGUg IlRyYWNpbmcuaCIKICNpbmNsdWRlICJVbmxpbmtlZENvZGVCbG9jay5oIgorI2luY2x1ZGUgIlZN LmgiCiAjaW5jbHVkZSAiV2Vha1NldElubGluZXMuaCIKICNpbmNsdWRlIDxhbGdvcml0aG0+CiAj aW5jbHVkZSA8d3RmL1JBTVNpemUuaD4KQEAgLTc1NCw5ICs3NTUsMTAgQEAgdm9pZCBIZWFwOjpj b2xsZWN0KFN3ZWVwVG9nZ2xlIHN3ZWVwVG9nZwogICAgIEpBVkFTQ1JJUFRDT1JFX0dDX0JFR0lO KCk7CiAgICAgUkVMRUFTRV9BU1NFUlQobV9vcGVyYXRpb25JblByb2dyZXNzID09IE5vT3BlcmF0 aW9uKTsKICAgICAKLSAgICBtX2RlZmVycmFsRGVwdGgrKzsgLy8gTWFrZSBzdXJlIHRoYXQgd2Ug ZG9uJ3QgR0MgaW4gdGhpcyBjYWxsLgotICAgIG1fdm0tPnByZXBhcmVUb0Rpc2NhcmRDb2RlKCk7 Ci0gICAgbV9kZWZlcnJhbERlcHRoLS07IC8vIERlY3JlbWVudCBkZWZlcmFsIG1hbnVhbGx5LCBz byB3ZSBkb24ndCBHQyB3aGVuIHdlIGRvIHNvLCBzaW5jZSB3ZSBhcmUgYWxyZWFkeSBHQ2luZyEu CisgICAgeworICAgICAgICBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkgcHJldGVuZCgqdGhpcyk7Cisg ICAgICAgIG1fdm0tPnByZXBhcmVUb0Rpc2NhcmRDb2RlKCk7CisgICAgfQogICAgIAogICAgIG1f b3BlcmF0aW9uSW5Qcm9ncmVzcyA9IENvbGxlY3Rpb247CiAgICAgbV9leHRyYU1lbW9yeVVzYWdl ID0gMDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgJKHJldmlzaW9uIDE2MDM0MCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkod29ya2luZyBjb3B5KQpAQCAt MjA0LDYgKzIwNCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBmcmllbmQgY2xhc3MgTWFy a2VkQmxvY2s7CiAgICAgICAgIGZyaWVuZCBjbGFzcyBDb3BpZWRTcGFjZTsKICAgICAgICAgZnJp ZW5kIGNsYXNzIENvcHlWaXNpdG9yOworICAgICAgICBmcmllbmQgY2xhc3MgUHJldGVuZEFsbG9j YXRpb25Pa2F5OwogICAgICAgICBmcmllbmQgY2xhc3MgU2xvdFZpc2l0b3I7CiAgICAgICAgIGZy aWVuZCBjbGFzcyBTdXBlclJlZ2lvbjsKICAgICAgICAgZnJpZW5kIGNsYXNzIEluY3JlbWVudGFs U3dlZXBlcjsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1ByZXRlbmRBbGxvY2F0 aW9uT2theS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1ByZXRl bmRBbGxvY2F0aW9uT2theS5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvUHJldGVuZEFsbG9jYXRpb25Pa2F5LmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw1 NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAx LiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisg KiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAq IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgUHJldGVuZEFsbG9jYXRpb25Pa2F5X2gKKyNkZWZp bmUgUHJldGVuZEFsbG9jYXRpb25Pa2F5X2gKKworI2luY2x1ZGUgIkhlYXAuaCIKKyNpbmNsdWRl ICJWTS5oIgorCituYW1lc3BhY2UgSlNDIHsKKworY2xhc3MgUHJldGVuZEFsbG9jYXRpb25Pa2F5 IHsKK3B1YmxpYzoKKyAgICBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkoSGVhcCYgaGVhcCkKKyAgICAg ICAgOiBtX2hlYXAoaGVhcCkKKyAgICAgICAgLCBtX3NhdmVkT2JqZWN0Q2xhc3MoaGVhcC52bSgp LT5tX2luaXRpYWxpemluZ09iamVjdENsYXNzKQorICAgIHsKKyAgICAgICAgbV9oZWFwLnZtKCkt Pm1faW5pdGlhbGl6aW5nT2JqZWN0Q2xhc3MgPSBudWxscHRyOworICAgICAgICBtX2hlYXAubV9k ZWZlcnJhbERlcHRoKys7IC8vIE1ha2Ugc3VyZSB0aGF0IHdlIGRvbid0IEdDLgorICAgIH0KKyAg ICAKKyAgICB+UHJldGVuZEFsbG9jYXRpb25Pa2F5KCkKKyAgICB7CisgICAgICAgIG1faGVhcC5t X2RlZmVycmFsRGVwdGgtLTsgLy8gRGVjcmVtZW50IGRlZmVyYWwgbWFudWFsbHksIHNvIHdlIGRv bid0IEdDIHdoZW4gd2UgZG8gc28sIHNpbmNlIHdlIGFyZSBhbHJlYWR5IEdDaW5nIS4KKyAgICAg ICAgbV9oZWFwLnZtKCktPm1faW5pdGlhbGl6aW5nT2JqZWN0Q2xhc3MgPSBtX3NhdmVkT2JqZWN0 Q2xhc3M7CisgICAgfQorCitwcml2YXRlOgorICAgIEhlYXAmIG1faGVhcDsKKyAgICBjb25zdCBD bGFzc0luZm8qIG1fc2F2ZWRPYmplY3RDbGFzczsKK307CisKK30KKworI2VuZGlmIC8vIFByZXRl bmRBbGxvY2F0aW9uT2theV9oCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9W TS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHJl dmlzaW9uIDE2MDM0MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHdv cmtpbmcgY29weSkKQEAgLTQ3Nyw2ICs0NzcsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBwcml2 YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgTExJbnRPZmZzZXRzRXh0cmFjdG9yOwogICAgICAg ICBmcmllbmQgY2xhc3MgQ2xlYXJFeGNlcHRpb25TY29wZTsKKyAgICAgICAgZnJpZW5kIGNsYXNz IFByZXRlbmRBbGxvY2F0aW9uT2theTsKICAgICAgICAgCiAgICAgICAgIFZNKFZNVHlwZSwgSGVh cFR5cGUpOwogICAgICAgICBzdGF0aWMgVk0qJiBzaGFyZWRJbnN0YW5jZUludGVybmFsKCk7Cg== 218819 2013-12-09 18:45:22 -0800 2013-12-10 08:25:45 -0800 Patch bug-125472-20131209184514.patch text/plain 12055 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwMzQ2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDEzLTEyLTA5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgQVNTRVJUICFoZWFwLnZtKCktPmlzSW5pdGlhbGl6aW5nT2JqZWN0KCkgd2hlbiBm aW5pc2hpbmcgREZHIGNvbXBpbGF0aW9uIGF0IGJlZ2lubmluZyBvZiBHQworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NDcyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyBpdCBs b29rIGxpa2UgaXQncyBva2F5IHRvIGFsbG9jYXRlIHNvIHRoYXQgdGhlIERGRyBwbGFuIGZpbmFs aXphdGlvbiBzdHVmZiAKKyAgICAgICAgY2FuIGRvIHdoYXQgaXQgbmVlZHMgdG8gZG8uIFdlIGFs cmVhZHkgZXhwZWN0ZWQgdGhhdCB3ZSBtaWdodCBkbyBhbGxvY2F0aW9uIGR1cmluZyBwbGFuIAor ICAgICAgICBmaW5hbGl6YXRpb24gYW5kIHdlIGluY3JlYXNlZCB0aGUgZGVmZXJyYWwgZGVwdGgg dG8gaGFuZGxlIHRoaXMsIGJ1dCB3ZSBuZWVkIHRvIGZpeCB0aGlzIG90aGVyIAorICAgICAgICBB U1NFUlQgc3R1ZmYgdG9vLgorCisgICAgICAgICogR05VbWFrZWZpbGUubGlzdC5hbToKKyAgICAg ICAgKiBKYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3JlLnZjeHByb2o6CisgICAg ICAgICogSmF2YVNjcmlwdENvcmUudmN4cHJvai9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qLmZpbHRl cnM6CisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK KyAgICAgICAgKiBoZWFwL0hlYXAuY3BwOgorICAgICAgICAoSlNDOjpIZWFwOjpjb2xsZWN0KToK KyAgICAgICAgKiBoZWFwL0hlYXAuaDoKKyAgICAgICAgKiBoZWFwL1ByZXRlbmRBbGxvY2F0aW9u T2theS5oOiBBZGRlZC4KKyAgICAgICAgKEpTQzo6UHJldGVuZEFsbG9jYXRpb25Pa2F5OjpQcmV0 ZW5kQWxsb2NhdGlvbk9rYXkpOgorICAgICAgICAoSlNDOjpQcmV0ZW5kQWxsb2NhdGlvbk9rYXk6 On5QcmV0ZW5kQWxsb2NhdGlvbk9rYXkpOgorICAgICAgICAqIHJ1bnRpbWUvVk0uaDoKKwogMjAx My0xMi0wOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlcGxhY2Ug dXNlIG9mIFdURjo6Rml4ZWRBcnJheSB3aXRoIHN0ZDo6YXJyYXkKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCShyZXZpc2lvbiAxNjAzNDYpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvR05VbWFrZWZpbGUubGlzdC5hbQkod29ya2luZyBjb3B5KQpAQCAt NTQ5LDYgKzU0OSw3IEBAIGphdmFzY3JpcHRjb3JlX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL1RpbnlCbG9vbUZpbHRlci5oIFwKIAlTb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9NYXJrZWRTcGFjZS5jcHAgXAogCVNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01h cmtlZFNwYWNlLmggXAorICAgIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1ByZXRlbmRBbGxv Y2F0aW9uT2theS5oIFwKIAlTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9SZWdpb24uaCBcCiAJ U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvU3Ryb25nLmggXAogCVNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL1N0cm9uZ0lubGluZXMuaCBcCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv SmF2YVNjcmlwdENvcmUudmN4cHJvai9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3Jp cHRDb3JlLnZjeHByb2oJKHJldmlzaW9uIDE2MDM0NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL0phdmFTY3JpcHRDb3JlLnZjeHByb2oJKHdvcmtpbmcg Y29weSkKQEAgLTk4MSw2ICs5ODEsNyBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caGVh cFxNYXJrZWRTcGFjZS5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caGVhcFxNYXJr U3RhY2suaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGhlYXBcTWFya1N0YWNrSW5s aW5lcy5oIiAvPgorICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caGVhcFxQcmV0ZW5kQWxsb2Nh dGlvbk9rYXkuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGhlYXBcUmVnaW9uLmgi IC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxoZWFwXFNsb3RWaXNpdG9yLmgiIC8+CiAg ICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxoZWFwXFNsb3RWaXNpdG9ySW5saW5lcy5oIiAvPgpA QCAtMTM0NSw0ICsxMzQ2LDQgQEAKICAgPEltcG9ydEdyb3VwIExhYmVsPSJFeHRlbnNpb25UYXJn ZXRzIj4KICAgICA8SW1wb3J0IFByb2plY3Q9IiQoVkNUYXJnZXRzUGF0aClcQnVpbGRDdXN0b21p emF0aW9uc1xtYXNtLnRhcmdldHMiIC8+CiAgIDwvSW1wb3J0R3JvdXA+Ci08L1Byb2plY3Q+Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9qZWN0PgpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvai5m aWx0ZXJzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29y ZS52Y3hwcm9qL0phdmFTY3JpcHRDb3JlLnZjeHByb2ouZmlsdGVycwkocmV2aXNpb24gMTYwMzQ2 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNj cmlwdENvcmUudmN4cHJvai5maWx0ZXJzCSh3b3JraW5nIGNvcHkpCkBAIC0xNjY3LDYgKzE2Njcs OSBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caGVhcFxNYXJrU3RhY2tJbmxpbmVzLmgi PgogICAgICAgPEZpbHRlcj5oZWFwPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CisgICAgPENs SW5jbHVkZSBJbmNsdWRlPSIuLlxoZWFwXFByZXRlbmRBbGxvY2F0aW9uT2theS5oIj4KKyAgICAg IDxGaWx0ZXI+aGVhcDwvRmlsdGVyPgorICAgIDwvQ2xJbmNsdWRlPgogICAgIDxDbEluY2x1ZGUg SW5jbHVkZT0iLi5caGVhcFxSZWdpb24uaCI+CiAgICAgICA8RmlsdGVyPmhlYXA8L0ZpbHRlcj4K ICAgICA8L0NsSW5jbHVkZT4KQEAgLTMxNzAsNCArMzE3Myw0IEBACiAgICAgICA8RmlsdGVyPmpp dDwvRmlsdGVyPgogICAgIDwvTUFTTT4KICAgPC9JdGVtR3JvdXA+Ci08L1Byb2plY3Q+ClwgTm8g bmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9qZWN0PgpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHJldmlzaW9uIDE2MDM0NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9K YXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBA IC03MTksNiArNzE5LDcgQEAKIAkJMkE0OEQxOTExNzcyMzY1QjAwQzY1QTVGIC8qIEFQSUNhbGxi YWNrRnVuY3Rpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEMyMTFCNTc0MTc2QTIyNEQwMDBFMkEyMyAvKiBBUElDYWxsYmFja0Z1bmN0aW9uLmggKi87 IH07CiAJCTJBNkY0NjI2MTdFOTU5Q0UwMEM0NUM5OCAvKiBIZWFwT3BlcmF0aW9uLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyQTZGNDYyNTE3RTk1OUNF MDBDNDVDOTggLyogSGVhcE9wZXJhdGlvbi5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CiAJCTJBN0E1OEVGMTgwOEE0QzQwMDIwQkRGNyAvKiBEZWZlckdD LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJBN0E1 OEVFMTgwOEE0QzQwMDIwQkRGNyAvKiBEZWZlckdDLmNwcCAqLzsgfTsKKwkJMkFBRDk2NEExODU2 OTQxNzAwMUY5M0JFIC8qIFByZXRlbmRBbGxvY2F0aW9uT2theS5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkFBRDk2NDkxODU2OTQxNzAwMUY5M0JFIC8q IFByZXRlbmRBbGxvY2F0aW9uT2theS5oICovOyB9OwogCQkyQUQ4OTMyQjE3RTM4NjhGMDA2Njgy NzYgLyogSGVhcEl0ZXJhdGlvblNjb3BlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAyQUQ4OTMyOTE3RTM4NjhGMDA2NjgyNzYgLyogSGVhcEl0ZXJhdGlv blNjb3BlLmggKi87IH07CiAJCTM3MUQ4NDJEMTdDOThCNkUwMEVDRjk5NCAvKiBsaWJ6LmR5bGli IGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzcxRDg0 MkMxN0M5OEI2RTAwRUNGOTk0IC8qIGxpYnouZHlsaWIgKi87IH07CiAJCTQxMzU5Q0YzMEZERDg5 QUQwMDIwNjE4MCAvKiBEYXRlQ29udmVyc2lvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gRDIxMjAyMjkwQUQ0MzEwQzAwRUQ3OUI2IC8qIERhdGVDb252 ZXJzaW9uLmggKi87IH07CkBAIC0xOTk1LDYgKzE5OTYsNyBAQAogCQkyQTI4MjVDRjE4MzQxRjJE MDA4N0ZCQTkgLyogRGVsYXllZFJlbGVhc2VTY29wZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBEZWxheWVkUmVsZWFzZVNjb3BlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTJBNkY0NjI1MTdFOTU5Q0UwMEM0NUM5OCAvKiBIZWFwT3BlcmF0aW9uLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhlYXBPcGVyYXRpb24uaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMkE3QTU4RUUxODA4QTRDNDAwMjBCREY3IC8qIERlZmVyR0MuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRGVmZXJHQy5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTJBQUQ5NjQ5MTg1Njk0MTcwMDFGOTNCRSAvKiBQcmV0 ZW5kQWxsb2NhdGlvbk9rYXkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUHJl dGVuZEFsbG9jYXRpb25Pa2F5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJBRDg5 MzI5MTdFMzg2OEYwMDY2ODI3NiAvKiBIZWFwSXRlcmF0aW9uU2NvcGUuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gSGVhcEl0ZXJhdGlvblNjb3BlLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTM3MUQ4NDJDMTdDOThCNkUwMEVDRjk5NCAvKiBsaWJ6LmR5bGliICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gImNvbXBpbGVk Lm1hY2gtby5keWxpYiI7IG5hbWUgPSBsaWJ6LmR5bGliOyBwYXRoID0gdXNyL2xpYi9saWJ6LmR5 bGliOyBzb3VyY2VUcmVlID0gU0RLUk9PVDsgfTsKIAkJNDQ5MDk3RUUwRjhGODFCNTAwNzZBMzI3 IC8qIEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsgcGF0 aCA9IEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtMzE0NSw2ICszMTQ3LDcgQEAKIAkJCQkwRkM4MTUwODE0MDQzQkNBMDBDRkE2MDMgLyogV3Jp dGVCYXJyaWVyU3VwcG9ydC5jcHAgKi8sCiAJCQkJMEZDODE1MDkxNDA0M0JEMjAwQ0ZBNjAzIC8q IFdyaXRlQmFycmllclN1cHBvcnQuaCAqLywKIAkJCQkyQTI4MjVDRjE4MzQxRjJEMDA4N0ZCQTkg LyogRGVsYXllZFJlbGVhc2VTY29wZS5oICovLAorCQkJCTJBQUQ5NjQ5MTg1Njk0MTcwMDFGOTNC RSAvKiBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkuaCAqLywKIAkJCSk7CiAJCQlwYXRoID0gaGVhcDsK IAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC00NjE5LDYgKzQ2MjIsNyBAQAogCQkJCTBG MkI2NkVBMTdCNkI1QUIwMEE3QUUzRiAvKiBKU0FycmF5QnVmZmVyVmlld0lubGluZXMuaCBpbiBI ZWFkZXJzICovLAogCQkJCUE3QkRBRUNCMTdGNEVBMTQwMEY2MTQwQyAvKiBKU0FycmF5SXRlcmF0 b3IuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDMThDNDE4MEUxNkY1Q0QwMEIzNDQ2MCAvKiBKU0Jh c2UuaCBpbiBIZWFkZXJzICovLAorCQkJCTJBQUQ5NjRBMTg1Njk0MTcwMDFGOTNCRSAvKiBQcmV0 ZW5kQWxsb2NhdGlvbk9rYXkuaCBpbiBIZWFkZXJzICovLAogCQkJCTE0MEQxN0Q3MEU4QUQ0QTkw MDBDRDE3RCAvKiBKU0Jhc2VQcml2YXRlLmggaW4gSGVhZGVycyAqLywKIAkJCQk4NkZBOUU5MjE0 MkJCQjJFMDAxNzczQjcgLyogSlNCb3VuZEZ1bmN0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQlC QzE4QzQxOTBFMTZGNUNEMDBCMzQ0NjAgLyogSlNDYWxsYmFja0NvbnN0cnVjdG9yLmggaW4gSGVh ZGVycyAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCShyZXZpc2lvbiAx NjAzNDYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzUsMTMgKzM1LDE0IEBACiAjaW5jbHVkZSAiSGVhcFN0YXRpc3RpY3MuaCIKICNp bmNsdWRlICJJbmNyZW1lbnRhbFN3ZWVwZXIuaCIKICNpbmNsdWRlICJJbnRlcnByZXRlci5oIgot I2luY2x1ZGUgIlZNLmgiCiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJK U0xvY2suaCIKICNpbmNsdWRlICJKU09OT2JqZWN0LmgiCiAjaW5jbHVkZSAiT3BlcmF0aW9ucy5o IgorI2luY2x1ZGUgIlByZXRlbmRBbGxvY2F0aW9uT2theS5oIgogI2luY2x1ZGUgIlRyYWNpbmcu aCIKICNpbmNsdWRlICJVbmxpbmtlZENvZGVCbG9jay5oIgorI2luY2x1ZGUgIlZNLmgiCiAjaW5j bHVkZSAiV2Vha1NldElubGluZXMuaCIKICNpbmNsdWRlIDxhbGdvcml0aG0+CiAjaW5jbHVkZSA8 d3RmL1JBTVNpemUuaD4KQEAgLTc1NCw5ICs3NTUsMTAgQEAgdm9pZCBIZWFwOjpjb2xsZWN0KFN3 ZWVwVG9nZ2xlIHN3ZWVwVG9nZwogICAgIEpBVkFTQ1JJUFRDT1JFX0dDX0JFR0lOKCk7CiAgICAg UkVMRUFTRV9BU1NFUlQobV9vcGVyYXRpb25JblByb2dyZXNzID09IE5vT3BlcmF0aW9uKTsKICAg ICAKLSAgICBtX2RlZmVycmFsRGVwdGgrKzsgLy8gTWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QgR0Mg aW4gdGhpcyBjYWxsLgotICAgIG1fdm0tPnByZXBhcmVUb0Rpc2NhcmRDb2RlKCk7Ci0gICAgbV9k ZWZlcnJhbERlcHRoLS07IC8vIERlY3JlbWVudCBkZWZlcmFsIG1hbnVhbGx5LCBzbyB3ZSBkb24n dCBHQyB3aGVuIHdlIGRvIHNvLCBzaW5jZSB3ZSBhcmUgYWxyZWFkeSBHQ2luZyEuCisgICAgewor ICAgICAgICBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkgcHJldGVuZCgqdGhpcyk7CisgICAgICAgIG1f dm0tPnByZXBhcmVUb0Rpc2NhcmRDb2RlKCk7CisgICAgfQogICAgIAogICAgIG1fb3BlcmF0aW9u SW5Qcm9ncmVzcyA9IENvbGxlY3Rpb247CiAgICAgbV9leHRyYU1lbW9yeVVzYWdlID0gMDsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgJKHJldmlzaW9uIDE2MDM0NikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkod29ya2luZyBjb3B5KQpAQCAtMjA0LDYgKzIw NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBmcmllbmQgY2xhc3MgTWFya2VkQmxvY2s7 CiAgICAgICAgIGZyaWVuZCBjbGFzcyBDb3BpZWRTcGFjZTsKICAgICAgICAgZnJpZW5kIGNsYXNz IENvcHlWaXNpdG9yOworICAgICAgICBmcmllbmQgY2xhc3MgUHJldGVuZEFsbG9jYXRpb25Pa2F5 OwogICAgICAgICBmcmllbmQgY2xhc3MgU2xvdFZpc2l0b3I7CiAgICAgICAgIGZyaWVuZCBjbGFz cyBTdXBlclJlZ2lvbjsKICAgICAgICAgZnJpZW5kIGNsYXNzIEluY3JlbWVudGFsU3dlZXBlcjsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1ByZXRlbmRBbGxvY2F0aW9uT2theS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1ByZXRlbmRBbGxvY2F0 aW9uT2theS5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvUHJl dGVuZEFsbG9jYXRpb25Pa2F5LmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw2NSBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFO RCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyNpZm5kZWYgUHJldGVuZEFsbG9jYXRpb25Pa2F5X2gKKyNkZWZpbmUgUHJldGVu ZEFsbG9jYXRpb25Pa2F5X2gKKworI2luY2x1ZGUgIkhlYXAuaCIKKyNpbmNsdWRlICJWTS5oIgor CituYW1lc3BhY2UgSlNDIHsKKworY2xhc3MgUHJldGVuZEFsbG9jYXRpb25Pa2F5IHsKK3B1Ymxp YzoKKyAgICBQcmV0ZW5kQWxsb2NhdGlvbk9rYXkoSGVhcCYgaGVhcCkKKyAgICAgICAgOiBtX2hl YXAoaGVhcCkKKyNpZm5kZWYgTkRFQlVHCisgICAgICAgICwgbV9zYXZlZE9iamVjdENsYXNzKGhl YXAudm0oKS0+bV9pbml0aWFsaXppbmdPYmplY3RDbGFzcykKKyNlbmRpZgorICAgIHsKKyNpZm5k ZWYgTkRFQlVHCisgICAgICAgIG1faGVhcC52bSgpLT5tX2luaXRpYWxpemluZ09iamVjdENsYXNz ID0gbnVsbHB0cjsKKyNlbmRpZgorICAgICAgICBtX2hlYXAubV9kZWZlcnJhbERlcHRoKys7IC8v IE1ha2Ugc3VyZSB0aGF0IHdlIGRvbid0IEdDLgorICAgIH0KKyAgICAKKyAgICB+UHJldGVuZEFs bG9jYXRpb25Pa2F5KCkKKyAgICB7CisgICAgICAgIG1faGVhcC5tX2RlZmVycmFsRGVwdGgtLTsg Ly8gRGVjcmVtZW50IGRlZmVyYWwgbWFudWFsbHksIHNvIHdlIGRvbid0IEdDIHdoZW4gd2UgZG8g c28sIHNpbmNlIHdlIGFyZSBhbHJlYWR5IEdDaW5nIS4KKyNpZm5kZWYgTkRFQlVHCisgICAgICAg IG1faGVhcC52bSgpLT5tX2luaXRpYWxpemluZ09iamVjdENsYXNzID0gbV9zYXZlZE9iamVjdENs YXNzOworI2VuZGlmCisgICAgfQorCitwcml2YXRlOgorICAgIEhlYXAmIG1faGVhcDsKKyNpZm5k ZWYgTkRFQlVHCisgICAgY29uc3QgQ2xhc3NJbmZvKiBtX3NhdmVkT2JqZWN0Q2xhc3M7CisjZW5k aWYKK307CisKK30KKworI2VuZGlmIC8vIFByZXRlbmRBbGxvY2F0aW9uT2theV9oCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHJldmlzaW9uIDE2MDM0NikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3Nyw2ICs0Nzcs NyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3Mg TExJbnRPZmZzZXRzRXh0cmFjdG9yOwogICAgICAgICBmcmllbmQgY2xhc3MgQ2xlYXJFeGNlcHRp b25TY29wZTsKKyAgICAgICAgZnJpZW5kIGNsYXNzIFByZXRlbmRBbGxvY2F0aW9uT2theTsKICAg ICAgICAgCiAgICAgICAgIFZNKFZNVHlwZSwgSGVhcFR5cGUpOwogICAgICAgICBzdGF0aWMgVk0q JiBzaGFyZWRJbnN0YW5jZUludGVybmFsKCk7Cg==