123092 2013-10-21 04:51:11 -0700 REGRESSION(r157690, r157699) Broken architectures using AssemblerBufferWithConstantPool 2013-10-29 10:46:29 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108645 123247 1 jbriance webkit-unassigned brian.holt changseok commit-queue fpizlo msaboff oliver ossy rgabor yannick.poirier zherczeg oldest_to_newest 941809 0 jbriance 2013-10-21 04:51:11 -0700 Architectures using AssemblerBufferWithConstantPool are broken since r157690 (and not fixed in r157699) because constant pools are not flushed before linking. Impacted architecures are CPU(SH4) and CPU(ARM_TRADITIONAL). 941810 1 214727 jbriance 2013-10-21 04:56:13 -0700 Created attachment 214727 Flush constant pool for sh4 and arm 941811 2 commit-queue 2013-10-21 04:58:31 -0700 Attachment 214727 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/assembler/ARMAssembler.h', u'Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h', u'Source/JavaScriptCore/assembler/LinkBuffer.cpp', u'Source/JavaScriptCore/assembler/SH4Assembler.h']" exit_code: 1 Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h:228: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 941815 3 214729 jbriance 2013-10-21 05:06:00 -0700 Created attachment 214729 Flush constant pool for sh4 and arm (with style fix) 941823 4 brian.holt 2013-10-21 06:29:09 -0700 I applied the patch and built with ARM_TRADITIONAL: ../../Source/JavaScriptCore/assembler/ARMAssembler.cpp: In member function 'WTF::PassRefPtr<WTF::MetaAllocatorHandle> JSC::ARMAssembler::executableCopy(JSC::VM&, void*, JSC::JITCompilationEffort)': ../../Source/JavaScriptCore/assembler/ARMAssembler.cpp:401:54: error: 'JSC::ARMAssembler::ARMBuffer' has no member named 'executableCopy' 941827 5 jbriance 2013-10-21 06:51:04 -0700 (In reply to comment #4) > I applied the patch and built with ARM_TRADITIONAL: > > ../../Source/JavaScriptCore/assembler/ARMAssembler.cpp: In member function 'WTF::PassRefPtr<WTF::MetaAllocatorHandle> JSC::ARMAssembler::executableCopy(JSC::VM&, void*, JSC::JITCompilationEffort)': > ../../Source/JavaScriptCore/assembler/ARMAssembler.cpp:401:54: error: 'JSC::ARMAssembler::ARMBuffer' has no member named 'executableCopy' PassRefPtr<ExecutableMemoryHandle> executableCopy(VM&, void* ownerUID, JITCompilationEffort) prototype declaration and its implementation should be removed from ARMAssembler.h and ARMAssembler.cpp because of r157690 941837 6 jbriance 2013-10-21 07:23:33 -0700 Mmmm, I didn't see that ARMAssembler::executableCopy does a lot of things compared to what SH4Assembler::executableCopy used to do(see http://trac.webkit.org/changeset/157699#file2). So this patch fixes crashes with SH4, but I think more actions are needed to fix ARM_TRADITIONAL. 942315 7 214729 commit-queue 2013-10-22 08:50:11 -0700 Comment on attachment 214729 Flush constant pool for sh4 and arm (with style fix) Clearing flags on attachment: 214729 Committed r157796: <http://trac.webkit.org/changeset/157796> 942316 8 commit-queue 2013-10-22 08:50:13 -0700 All reviewed patches have been landed. Closing bug. 942980 9 changseok 2013-10-23 21:46:43 -0700 (In reply to comment #6) > Mmmm, I didn't see that ARMAssembler::executableCopy does a lot of things compared to what SH4Assembler::executableCopy used to do(see http://trac.webkit.org/changeset/157699#file2). > > So this patch fixes crashes with SH4, but I think more actions are needed to fix ARM_TRADITIONAL. Right. I'm facing the exactly same problem you mentioned with old ARM. Somebody cares about this? 942984 10 fpizlo 2013-10-23 22:26:58 -0700 (In reply to comment #9) > (In reply to comment #6) > > Mmmm, I didn't see that ARMAssembler::executableCopy does a lot of things compared to what SH4Assembler::executableCopy used to do(see http://trac.webkit.org/changeset/157699#file2). > > > > So this patch fixes crashes with SH4, but I think more actions are needed to fix ARM_TRADITIONAL. > > Right. I'm facing the exactly same problem you mentioned with old ARM. Somebody cares about this? Good question. We should decide if we care. If we don't care then we should remove it. 942987 11 changseok 2013-10-23 22:45:28 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #6) > > > Mmmm, I didn't see that ARMAssembler::executableCopy does a lot of things compared to what SH4Assembler::executableCopy used to do(see http://trac.webkit.org/changeset/157699#file2). > > > > > > So this patch fixes crashes with SH4, but I think more actions are needed to fix ARM_TRADITIONAL. > > > > Right. I'm facing the exactly same problem you mentioned with old ARM. Somebody cares about this? > > Good question. We should decide if we care. If we don't care then we should remove it. Well. I think it's not the time to stop caring this. I opened a bug to discuss further. https://bugs.webkit.org/show_bug.cgi?id=123247 214727 2013-10-21 04:56:13 -0700 2013-10-21 05:05:31 -0700 Flush constant pool for sh4 and arm bug-123092.patch text/plain 5932 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU3NzE3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTEwLTIxICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjE1NzY5MCwgcjE1NzY5OSkgRml4IGFyY2hpdGVjdHVyZXMgdXNp bmcgQXNzZW1ibGVyQnVmZmVyV2l0aENvbnN0YW50UG9vbC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzA5MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGFjdGVkIGFyY2hpdGVjdHVyZXMgYXJlIFNI NCBhbmQgQVJNX1RSQURJVElPTkFMLgorCisgICAgICAgICogYXNzZW1ibGVyL0FSTUFzc2VtYmxl ci5oOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6OmJ1ZmZlcik6CisgICAgICAgICogYXNz ZW1ibGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBvb2wuaDoKKyAgICAgICAgKEpTQzo6 QXNzZW1ibGVyQnVmZmVyV2l0aENvbnN0YW50UG9vbDo6Zmx1c2hDb25zdGFudFBvb2wpOgorICAg ICAgICAqIGFzc2VtYmxlci9MaW5rQnVmZmVyLmNwcDoKKyAgICAgICAgKEpTQzo6TGlua0J1ZmZl cjo6bGlua0NvZGUpOgorICAgICAgICAqIGFzc2VtYmxlci9TSDRBc3NlbWJsZXIuaDoKKyAgICAg ICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpidWZmZXIpOgorCiAyMDEzLTEwLTIxICBOYWRhdiBSb3Rl bSAgPG5yb3RlbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEFsbEluT25lRmlsZS5jcHAK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIu aAkocmV2aXNpb24gMTU3NzEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9B Uk1Bc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSw4IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICB7CiAgICAgICAgIH0KIAorICAgICAgICBBUk1CdWZmZXImIGJ1ZmZl cigpIHsgcmV0dXJuIG1fYnVmZmVyOyB9CisKICAgICAgICAgLy8gQVJNIGNvbmRpdGlvbmFsIGNv bnN0YW50cwogICAgICAgICB0eXBlZGVmIGVudW0gewogICAgICAgICAgICAgRVEgPSAweDAwMDAw MDAwLCAvLyBaZXJvIC8gRXF1YWwuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBvb2wuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBv b2wuaAkocmV2aXNpb24gMTU3NzEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci9Bc3NlbWJsZXJCdWZmZXJXaXRoQ29uc3RhbnRQb29sLmgJKHdvcmtpbmcgY29weSkKQEAgLTIy Myw2ICsyMjMsNDEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9udW1Db25zdHM7CiAgICAg fQogCisgICAgdm9pZCBmbHVzaENvbnN0YW50UG9vbChib29sIHVzZUJhcnJpZXIgPSB0cnVlKQor ICAgIHsKKyAgICAgICAgaWYgKG1fbnVtQ29uc3RzID09IDApCisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIGludCBhbGlnblBvb2wgPSAoY29kZVNpemUoKSArICh1c2VCYXJyaWVyID8gYmFy cmllclNpemUgOiAwKSkgJiAoc2l6ZW9mKHVpbnQ2NF90KSAtIDEpOworCisgICAgICAgIGlmIChh bGlnblBvb2wpCisgICAgICAgICAgICBhbGlnblBvb2wgPSBzaXplb2YodWludDY0X3QpIC0gYWxp Z25Qb29sOworCisgICAgICAgIC8vIENhbGxiYWNrIHRvIHByb3RlY3QgdGhlIGNvbnN0YW50IHBv b2wgZnJvbSBleGVjdXRpb24KKyAgICAgICAgaWYgKHVzZUJhcnJpZXIpCisgICAgICAgICAgICBw dXRJbnRlZ3JhbChBc3NlbWJsZXJUeXBlOjpwbGFjZUNvbnN0YW50UG9vbEJhcnJpZXIobV9udW1D b25zdHMgKiBzaXplb2YodWludDMyX3QpICsgYWxpZ25Qb29sKSk7CisKKyAgICAgICAgaWYgKGFs aWduUG9vbCkgeworICAgICAgICAgICAgaWYgKGFsaWduUG9vbCAmIDEpCisgICAgICAgICAgICAg ICAgQXNzZW1ibGVyQnVmZmVyOjpwdXRCeXRlKEFzc2VtYmxlclR5cGU6OnBhZEZvckFsaWduOCk7 CisgICAgICAgICAgICBpZiAoYWxpZ25Qb29sICYgMikKKyAgICAgICAgICAgICAgICBBc3NlbWJs ZXJCdWZmZXI6OnB1dFNob3J0KEFzc2VtYmxlclR5cGU6OnBhZEZvckFsaWduMTYpOworICAgICAg ICAgICAgaWYgKGFsaWduUG9vbCAmIDQpCisgICAgICAgICAgICAgICAgQXNzZW1ibGVyQnVmZmVy OjpwdXRJbnQoQXNzZW1ibGVyVHlwZTo6cGFkRm9yQWxpZ24zMik7CisgICAgICAgIH0KKworICAg ICAgICBpbnQgY29uc3RQb29sT2Zmc2V0ID0gY29kZVNpemUoKTsKKyAgICAgICAgYXBwZW5kKHJl aW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KG1fcG9vbCksIG1fbnVtQ29uc3RzICogc2l6ZW9mKHVpbnQz Ml90KSk7CisKKyAgICAgICAgLy8gUGF0Y2ggZWFjaCBQQyByZWxhdGl2ZSBsb2FkCisgICAgICAg IGZvciAoTG9hZE9mZnNldHM6Okl0ZXJhdG9yIGl0ZXIgPSBtX2xvYWRPZmZzZXRzLmJlZ2luKCk7 IGl0ZXIgIT0gbV9sb2FkT2Zmc2V0cy5lbmQoKTsgKytpdGVyKSB7CisgICAgICAgICAgICB2b2lk KiBsb2FkQWRkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGRhdGEoKSkgKyAqaXRlcjsKKyAg ICAgICAgICAgIEFzc2VtYmxlclR5cGU6OnBhdGNoQ29uc3RhbnRQb29sTG9hZChsb2FkQWRkciwg cmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oZGF0YSgpKSArIGNvbnN0UG9vbE9mZnNldCk7CisgICAg ICAgIH0KKworICAgICAgICBtX2xvYWRPZmZzZXRzLmNsZWFyKCk7CisgICAgICAgIG1fbnVtQ29u c3RzID0gMDsKKyAgICB9CisKIHByaXZhdGU6CiAgICAgdm9pZCBjb3JyZWN0RGVsdGFzKGludCBp bnNuU2l6ZSkKICAgICB7CkBAIC0yNjcsNDEgKzMwMiw2IEBAIHByaXZhdGU6CiAgICAgICAgIGNv cnJlY3REZWx0YXMoc2l6ZW9mKEludGVncmFsVHlwZSksIDQpOwogICAgIH0KIAotICAgIHZvaWQg Zmx1c2hDb25zdGFudFBvb2woYm9vbCB1c2VCYXJyaWVyID0gdHJ1ZSkKLSAgICB7Ci0gICAgICAg IGlmIChtX251bUNvbnN0cyA9PSAwKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpbnQg YWxpZ25Qb29sID0gKGNvZGVTaXplKCkgKyAodXNlQmFycmllciA/IGJhcnJpZXJTaXplIDogMCkp ICYgKHNpemVvZih1aW50NjRfdCkgLSAxKTsKLQotICAgICAgICBpZiAoYWxpZ25Qb29sKQotICAg ICAgICAgICAgYWxpZ25Qb29sID0gc2l6ZW9mKHVpbnQ2NF90KSAtIGFsaWduUG9vbDsKLQotICAg ICAgICAvLyBDYWxsYmFjayB0byBwcm90ZWN0IHRoZSBjb25zdGFudCBwb29sIGZyb20gZXhlY3V0 aW9uCi0gICAgICAgIGlmICh1c2VCYXJyaWVyKQotICAgICAgICAgICAgcHV0SW50ZWdyYWwoQXNz ZW1ibGVyVHlwZTo6cGxhY2VDb25zdGFudFBvb2xCYXJyaWVyKG1fbnVtQ29uc3RzICogc2l6ZW9m KHVpbnQzMl90KSArIGFsaWduUG9vbCkpOwotCi0gICAgICAgIGlmIChhbGlnblBvb2wpIHsKLSAg ICAgICAgICAgIGlmIChhbGlnblBvb2wgJiAxKQotICAgICAgICAgICAgICAgIEFzc2VtYmxlckJ1 ZmZlcjo6cHV0Qnl0ZShBc3NlbWJsZXJUeXBlOjpwYWRGb3JBbGlnbjgpOwotICAgICAgICAgICAg aWYgKGFsaWduUG9vbCAmIDIpCi0gICAgICAgICAgICAgICAgQXNzZW1ibGVyQnVmZmVyOjpwdXRT aG9ydChBc3NlbWJsZXJUeXBlOjpwYWRGb3JBbGlnbjE2KTsKLSAgICAgICAgICAgIGlmIChhbGln blBvb2wgJiA0KQotICAgICAgICAgICAgICAgIEFzc2VtYmxlckJ1ZmZlcjo6cHV0SW50KEFzc2Vt YmxlclR5cGU6OnBhZEZvckFsaWduMzIpOwotICAgICAgICB9Ci0KLSAgICAgICAgaW50IGNvbnN0 UG9vbE9mZnNldCA9IGNvZGVTaXplKCk7Ci0gICAgICAgIGFwcGVuZChyZWludGVycHJldF9jYXN0 PGNoYXIqPihtX3Bvb2wpLCBtX251bUNvbnN0cyAqIHNpemVvZih1aW50MzJfdCkpOwotCi0gICAg ICAgIC8vIFBhdGNoIGVhY2ggUEMgcmVsYXRpdmUgbG9hZAotICAgICAgICBmb3IgKExvYWRPZmZz ZXRzOjpJdGVyYXRvciBpdGVyID0gbV9sb2FkT2Zmc2V0cy5iZWdpbigpOyBpdGVyICE9IG1fbG9h ZE9mZnNldHMuZW5kKCk7ICsraXRlcikgewotICAgICAgICAgICAgdm9pZCogbG9hZEFkZHIgPSBy ZWludGVycHJldF9jYXN0PGNoYXIqPihkYXRhKCkpICsgKml0ZXI7Ci0gICAgICAgICAgICBBc3Nl bWJsZXJUeXBlOjpwYXRjaENvbnN0YW50UG9vbExvYWQobG9hZEFkZHIsIHJlaW50ZXJwcmV0X2Nh c3Q8Y2hhcio+KGRhdGEoKSkgKyBjb25zdFBvb2xPZmZzZXQpOwotICAgICAgICB9Ci0KLSAgICAg ICAgbV9sb2FkT2Zmc2V0cy5jbGVhcigpOwotICAgICAgICBtX251bUNvbnN0cyA9IDA7Ci0gICAg fQotCiAgICAgdm9pZCBmbHVzaElmTm9TcGFjZUZvcihpbnQgbmV4dEluc25TaXplKQogICAgIHsK ICAgICAgICAgaWYgKG1fbnVtQ29uc3RzID09IDApCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL0xpbmtCdWZmZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTGlua0J1ZmZlci5jcHAJKHJldmlzaW9uIDE1NzcxMCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTGlua0J1ZmZlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEzNiw2ICsxMzYsOSBAQCB2b2lkIExpbmtCdWZmZXI6OmxpbmtDb2RlKHZvaWQqIG93 bmVyVUlECiB7CiAgICAgQVNTRVJUKCFtX2NvZGUpOwogI2lmICFFTkFCTEUoQlJBTkNIX0NPTVBB Q1RJT04pCisjaWYgZGVmaW5lZChBU1NFTUJMRVJfSEFTX0NPTlNUQU5UX1BPT0wpICYmIEFTU0VN QkxFUl9IQVNfQ09OU1RBTlRfUE9PTAorICAgIG1fYXNzZW1ibGVyLT5tX2Fzc2VtYmxlci5idWZm ZXIoKS5mbHVzaENvbnN0YW50UG9vbChmYWxzZSk7CisjZW5kaWYKICAgICBBc3NlbWJsZXJCdWZm ZXImIGJ1ZmZlciA9IG1fYXNzZW1ibGVyLT5tX2Fzc2VtYmxlci5idWZmZXIoKTsKICAgICBhbGxv Y2F0ZShidWZmZXIuY29kZVNpemUoKSwgb3duZXJVSUQsIGVmZm9ydCk7CiAgICAgaWYgKCFtX2Rp ZEFsbG9jYXRlKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9TSDRBc3Nl bWJsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NI NEFzc2VtYmxlci5oCShyZXZpc2lvbiAxNTc3MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL1NINEFzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNDUsNyArMzQ1LDcg QEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICBBc3NlbWJsZXJCdWZmZXImIGJ1ZmZlcigp IHsgcmV0dXJuIG1fYnVmZmVyOyB9CisgICAgU0g0QnVmZmVyJiBidWZmZXIoKSB7IHJldHVybiBt X2J1ZmZlcjsgfQogCiAgICAgLy8gU0g0IGNvbmRpdGlvbiBjb2RlcwogICAgIHR5cGVkZWYgZW51 bSB7Cg== 214729 2013-10-21 05:06:00 -0700 2013-10-22 08:50:10 -0700 Flush constant pool for sh4 and arm (with style fix) bug-123092_2.patch text/plain 5928 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU3NzE3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTEwLTIxICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjE1NzY5MCwgcjE1NzY5OSkgRml4IGFyY2hpdGVjdHVyZXMgdXNp bmcgQXNzZW1ibGVyQnVmZmVyV2l0aENvbnN0YW50UG9vbC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzA5MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGFjdGVkIGFyY2hpdGVjdHVyZXMgYXJlIFNI NCBhbmQgQVJNX1RSQURJVElPTkFMLgorCisgICAgICAgICogYXNzZW1ibGVyL0FSTUFzc2VtYmxl ci5oOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6OmJ1ZmZlcik6CisgICAgICAgICogYXNz ZW1ibGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBvb2wuaDoKKyAgICAgICAgKEpTQzo6 QXNzZW1ibGVyQnVmZmVyV2l0aENvbnN0YW50UG9vbDo6Zmx1c2hDb25zdGFudFBvb2wpOgorICAg ICAgICAqIGFzc2VtYmxlci9MaW5rQnVmZmVyLmNwcDoKKyAgICAgICAgKEpTQzo6TGlua0J1ZmZl cjo6bGlua0NvZGUpOgorICAgICAgICAqIGFzc2VtYmxlci9TSDRBc3NlbWJsZXIuaDoKKyAgICAg ICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpidWZmZXIpOgorCiAyMDEzLTEwLTIxICBOYWRhdiBSb3Rl bSAgPG5yb3RlbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEFsbEluT25lRmlsZS5jcHAK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIu aAkocmV2aXNpb24gMTU3NzEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9B Uk1Bc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSw4IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICB7CiAgICAgICAgIH0KIAorICAgICAgICBBUk1CdWZmZXImIGJ1ZmZl cigpIHsgcmV0dXJuIG1fYnVmZmVyOyB9CisKICAgICAgICAgLy8gQVJNIGNvbmRpdGlvbmFsIGNv bnN0YW50cwogICAgICAgICB0eXBlZGVmIGVudW0gewogICAgICAgICAgICAgRVEgPSAweDAwMDAw MDAwLCAvLyBaZXJvIC8gRXF1YWwuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBvb2wuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0Fzc2VtYmxlckJ1ZmZlcldpdGhDb25zdGFudFBv b2wuaAkocmV2aXNpb24gMTU3NzEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci9Bc3NlbWJsZXJCdWZmZXJXaXRoQ29uc3RhbnRQb29sLmgJKHdvcmtpbmcgY29weSkKQEAgLTIy Myw2ICsyMjMsNDEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9udW1Db25zdHM7CiAgICAg fQogCisgICAgdm9pZCBmbHVzaENvbnN0YW50UG9vbChib29sIHVzZUJhcnJpZXIgPSB0cnVlKQor ICAgIHsKKyAgICAgICAgaWYgKCFtX251bUNvbnN0cykKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgaW50IGFsaWduUG9vbCA9IChjb2RlU2l6ZSgpICsgKHVzZUJhcnJpZXIgPyBiYXJyaWVy U2l6ZSA6IDApKSAmIChzaXplb2YodWludDY0X3QpIC0gMSk7CisKKyAgICAgICAgaWYgKGFsaWdu UG9vbCkKKyAgICAgICAgICAgIGFsaWduUG9vbCA9IHNpemVvZih1aW50NjRfdCkgLSBhbGlnblBv b2w7CisKKyAgICAgICAgLy8gQ2FsbGJhY2sgdG8gcHJvdGVjdCB0aGUgY29uc3RhbnQgcG9vbCBm cm9tIGV4ZWN1dGlvbgorICAgICAgICBpZiAodXNlQmFycmllcikKKyAgICAgICAgICAgIHB1dElu dGVncmFsKEFzc2VtYmxlclR5cGU6OnBsYWNlQ29uc3RhbnRQb29sQmFycmllcihtX251bUNvbnN0 cyAqIHNpemVvZih1aW50MzJfdCkgKyBhbGlnblBvb2wpKTsKKworICAgICAgICBpZiAoYWxpZ25Q b29sKSB7CisgICAgICAgICAgICBpZiAoYWxpZ25Qb29sICYgMSkKKyAgICAgICAgICAgICAgICBB c3NlbWJsZXJCdWZmZXI6OnB1dEJ5dGUoQXNzZW1ibGVyVHlwZTo6cGFkRm9yQWxpZ244KTsKKyAg ICAgICAgICAgIGlmIChhbGlnblBvb2wgJiAyKQorICAgICAgICAgICAgICAgIEFzc2VtYmxlckJ1 ZmZlcjo6cHV0U2hvcnQoQXNzZW1ibGVyVHlwZTo6cGFkRm9yQWxpZ24xNik7CisgICAgICAgICAg ICBpZiAoYWxpZ25Qb29sICYgNCkKKyAgICAgICAgICAgICAgICBBc3NlbWJsZXJCdWZmZXI6OnB1 dEludChBc3NlbWJsZXJUeXBlOjpwYWRGb3JBbGlnbjMyKTsKKyAgICAgICAgfQorCisgICAgICAg IGludCBjb25zdFBvb2xPZmZzZXQgPSBjb2RlU2l6ZSgpOworICAgICAgICBhcHBlbmQocmVpbnRl cnByZXRfY2FzdDxjaGFyKj4obV9wb29sKSwgbV9udW1Db25zdHMgKiBzaXplb2YodWludDMyX3Qp KTsKKworICAgICAgICAvLyBQYXRjaCBlYWNoIFBDIHJlbGF0aXZlIGxvYWQKKyAgICAgICAgZm9y IChMb2FkT2Zmc2V0czo6SXRlcmF0b3IgaXRlciA9IG1fbG9hZE9mZnNldHMuYmVnaW4oKTsgaXRl ciAhPSBtX2xvYWRPZmZzZXRzLmVuZCgpOyArK2l0ZXIpIHsKKyAgICAgICAgICAgIHZvaWQqIGxv YWRBZGRyID0gcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oZGF0YSgpKSArICppdGVyOworICAgICAg ICAgICAgQXNzZW1ibGVyVHlwZTo6cGF0Y2hDb25zdGFudFBvb2xMb2FkKGxvYWRBZGRyLCByZWlu dGVycHJldF9jYXN0PGNoYXIqPihkYXRhKCkpICsgY29uc3RQb29sT2Zmc2V0KTsKKyAgICAgICAg fQorCisgICAgICAgIG1fbG9hZE9mZnNldHMuY2xlYXIoKTsKKyAgICAgICAgbV9udW1Db25zdHMg PSAwOworICAgIH0KKwogcHJpdmF0ZToKICAgICB2b2lkIGNvcnJlY3REZWx0YXMoaW50IGluc25T aXplKQogICAgIHsKQEAgLTI2Nyw0MSArMzAyLDYgQEAgcHJpdmF0ZToKICAgICAgICAgY29ycmVj dERlbHRhcyhzaXplb2YoSW50ZWdyYWxUeXBlKSwgNCk7CiAgICAgfQogCi0gICAgdm9pZCBmbHVz aENvbnN0YW50UG9vbChib29sIHVzZUJhcnJpZXIgPSB0cnVlKQotICAgIHsKLSAgICAgICAgaWYg KG1fbnVtQ29uc3RzID09IDApCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGludCBhbGln blBvb2wgPSAoY29kZVNpemUoKSArICh1c2VCYXJyaWVyID8gYmFycmllclNpemUgOiAwKSkgJiAo c2l6ZW9mKHVpbnQ2NF90KSAtIDEpOwotCi0gICAgICAgIGlmIChhbGlnblBvb2wpCi0gICAgICAg ICAgICBhbGlnblBvb2wgPSBzaXplb2YodWludDY0X3QpIC0gYWxpZ25Qb29sOwotCi0gICAgICAg IC8vIENhbGxiYWNrIHRvIHByb3RlY3QgdGhlIGNvbnN0YW50IHBvb2wgZnJvbSBleGVjdXRpb24K LSAgICAgICAgaWYgKHVzZUJhcnJpZXIpCi0gICAgICAgICAgICBwdXRJbnRlZ3JhbChBc3NlbWJs ZXJUeXBlOjpwbGFjZUNvbnN0YW50UG9vbEJhcnJpZXIobV9udW1Db25zdHMgKiBzaXplb2YodWlu dDMyX3QpICsgYWxpZ25Qb29sKSk7Ci0KLSAgICAgICAgaWYgKGFsaWduUG9vbCkgewotICAgICAg ICAgICAgaWYgKGFsaWduUG9vbCAmIDEpCi0gICAgICAgICAgICAgICAgQXNzZW1ibGVyQnVmZmVy OjpwdXRCeXRlKEFzc2VtYmxlclR5cGU6OnBhZEZvckFsaWduOCk7Ci0gICAgICAgICAgICBpZiAo YWxpZ25Qb29sICYgMikKLSAgICAgICAgICAgICAgICBBc3NlbWJsZXJCdWZmZXI6OnB1dFNob3J0 KEFzc2VtYmxlclR5cGU6OnBhZEZvckFsaWduMTYpOwotICAgICAgICAgICAgaWYgKGFsaWduUG9v bCAmIDQpCi0gICAgICAgICAgICAgICAgQXNzZW1ibGVyQnVmZmVyOjpwdXRJbnQoQXNzZW1ibGVy VHlwZTo6cGFkRm9yQWxpZ24zMik7Ci0gICAgICAgIH0KLQotICAgICAgICBpbnQgY29uc3RQb29s T2Zmc2V0ID0gY29kZVNpemUoKTsKLSAgICAgICAgYXBwZW5kKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hh cio+KG1fcG9vbCksIG1fbnVtQ29uc3RzICogc2l6ZW9mKHVpbnQzMl90KSk7Ci0KLSAgICAgICAg Ly8gUGF0Y2ggZWFjaCBQQyByZWxhdGl2ZSBsb2FkCi0gICAgICAgIGZvciAoTG9hZE9mZnNldHM6 Okl0ZXJhdG9yIGl0ZXIgPSBtX2xvYWRPZmZzZXRzLmJlZ2luKCk7IGl0ZXIgIT0gbV9sb2FkT2Zm c2V0cy5lbmQoKTsgKytpdGVyKSB7Ci0gICAgICAgICAgICB2b2lkKiBsb2FkQWRkciA9IHJlaW50 ZXJwcmV0X2Nhc3Q8Y2hhcio+KGRhdGEoKSkgKyAqaXRlcjsKLSAgICAgICAgICAgIEFzc2VtYmxl clR5cGU6OnBhdGNoQ29uc3RhbnRQb29sTG9hZChsb2FkQWRkciwgcmVpbnRlcnByZXRfY2FzdDxj aGFyKj4oZGF0YSgpKSArIGNvbnN0UG9vbE9mZnNldCk7Ci0gICAgICAgIH0KLQotICAgICAgICBt X2xvYWRPZmZzZXRzLmNsZWFyKCk7Ci0gICAgICAgIG1fbnVtQ29uc3RzID0gMDsKLSAgICB9Ci0K ICAgICB2b2lkIGZsdXNoSWZOb1NwYWNlRm9yKGludCBuZXh0SW5zblNpemUpCiAgICAgewogICAg ICAgICBpZiAobV9udW1Db25zdHMgPT0gMCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTGlua0J1ZmZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmNwcAkocmV2aXNpb24gMTU3NzEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTM2LDYgKzEzNiw5IEBAIHZvaWQgTGlua0J1ZmZlcjo6bGlua0NvZGUodm9pZCogb3duZXJV SUQKIHsKICAgICBBU1NFUlQoIW1fY29kZSk7CiAjaWYgIUVOQUJMRShCUkFOQ0hfQ09NUEFDVElP TikKKyNpZiBkZWZpbmVkKEFTU0VNQkxFUl9IQVNfQ09OU1RBTlRfUE9PTCkgJiYgQVNTRU1CTEVS X0hBU19DT05TVEFOVF9QT09MCisgICAgbV9hc3NlbWJsZXItPm1fYXNzZW1ibGVyLmJ1ZmZlcigp LmZsdXNoQ29uc3RhbnRQb29sKGZhbHNlKTsKKyNlbmRpZgogICAgIEFzc2VtYmxlckJ1ZmZlciYg YnVmZmVyID0gbV9hc3NlbWJsZXItPm1fYXNzZW1ibGVyLmJ1ZmZlcigpOwogICAgIGFsbG9jYXRl KGJ1ZmZlci5jb2RlU2l6ZSgpLCBvd25lclVJRCwgZWZmb3J0KTsKICAgICBpZiAoIW1fZGlkQWxs b2NhdGUpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NINEFzc2VtYmxl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvU0g0QXNz ZW1ibGVyLmgJKHJldmlzaW9uIDE1NzcxMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvU0g0QXNzZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0NSw3ICszNDUsNyBAQCBw dWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIEFzc2VtYmxlckJ1ZmZlciYgYnVmZmVyKCkgeyBy ZXR1cm4gbV9idWZmZXI7IH0KKyAgICBTSDRCdWZmZXImIGJ1ZmZlcigpIHsgcmV0dXJuIG1fYnVm ZmVyOyB9CiAKICAgICAvLyBTSDQgY29uZGl0aW9uIGNvZGVzCiAgICAgdHlwZWRlZiBlbnVtIHsK