163255 2016-10-10 16:47:13 -0700 HasOwnPropertyCache needs to ref the UniquedStringImpls it sees 2023-02-08 07:27:10 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin cgarcia commit-queue darin fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff oliver ossy ticaiolima toddcarson876 ysuzuki oldest_to_newest 1238616 0 saam 2016-10-10 16:47:13 -0700 ... 1239002 1 291295 saam 2016-10-11 14:17:37 -0700 Created attachment 291295 patch 1239003 2 291295 saam 2016-10-11 14:18:24 -0700 Comment on attachment 291295 patch View in context: https://bugs.webkit.org/attachment.cgi?id=291295&action=review > Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:62 > + bitwise_cast<HasOwnPropertyCache*>(cache)->clear(); I'll make this a static_cast 1239005 3 commit-queue 2016-10-11 14:19:23 -0700 Attachment 291295 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:116: Missing space before { [whitespace/braces] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1239006 4 291295 jfbastien 2016-10-11 14:20:13 -0700 Comment on attachment 291295 patch View in context: https://bugs.webkit.org/attachment.cgi?id=291295&action=review > Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:133 > memset(this, 0, sizeof(Entry) * size); Could you just placement new instead? 1239016 5 291295 ggaren 2016-10-11 14:33:01 -0700 Comment on attachment 291295 patch View in context: https://bugs.webkit.org/attachment.cgi?id=291295&action=review > Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:123 > + bitwise_cast<Entry*>(this)[i].Entry::~Entry(); Pointer casting can use reinterpret_cast. 1239047 6 saam 2016-10-11 15:30:07 -0700 (In reply to comment #5) > Comment on attachment 291295 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291295&action=review > > > Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:123 > > + bitwise_cast<Entry*>(this)[i].Entry::~Entry(); > > Pointer casting can use reinterpret_cast. I prefer bitwise_cast for this still because it does the sizeof check. Which prevents e from making mistakes like this: unsigned bar = ...; Foo* ptr = bitwise_cast<Foo*>(bar); 1239090 7 291315 saam 2016-10-11 16:33:18 -0700 Created attachment 291315 patch for landing 1239092 8 commit-queue 2016-10-11 16:35:52 -0700 Attachment 291315 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/HasOwnPropertyCache.h:118: Missing space before { [whitespace/braces] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1239148 9 291315 commit-queue 2016-10-11 20:17:32 -0700 Comment on attachment 291315 patch for landing Clearing flags on attachment: 291315 Committed r207186: <http://trac.webkit.org/changeset/207186> 1239149 10 commit-queue 2016-10-11 20:17:37 -0700 All reviewed patches have been landed. Closing bug. 1239224 11 cgarcia 2016-10-12 02:32:43 -0700 This broke the build in several linux bots (GTK+, JSCOnly). Maybe something not supported by GCC 4.9? https://build.webkit.org/builders/JSCOnly%20Linux%20ARMv7%20Thumb2%20Release/builds/2318/steps/compile-webkit/logs/stdio 1239225 12 ossy 2016-10-12 02:51:10 -0700 (In reply to comment #11) > This broke the build in several linux bots (GTK+, JSCOnly). Maybe something > not supported by GCC 4.9? > > https://build.webkit.org/builders/JSCOnly%20Linux%20ARMv7%20Thumb2%20Release/ > builds/2318/steps/compile-webkit/logs/stdio I also noticed this error, adding Entry::Entry(RefPtr<UniquedStringImpl>, StructureID, bool) constructor fixed the build for me. I'm goning to land it immediately. 1239226 13 ossy 2016-10-12 02:59:00 -0700 Fix landed in http://trac.webkit.org/changeset/207213. (In reply to comment #11) > This broke the build in several linux bots (GTK+, JSCOnly). Maybe something > not supported by GCC 4.9? > > https://build.webkit.org/builders/JSCOnly%20Linux%20ARMv7%20Thumb2%20Release/ > builds/2318/steps/compile-webkit/logs/stdio But the question is why the GTK EWS was green? Do you have different compiler on the EWS and buildbots? It would be great to keep them in sync. 1239230 14 ossy 2016-10-12 03:14:08 -0700 Additionally it was broken on Apple Windows and WinCairo bots too. Is it a compiler bug in MSVC and GCC? Is C++11/14/17 allows the compiler to generate Entry::Entry(RefPtr<UniquedStringImpl>, StructureID, bool) constructor? 1239232 15 ossy 2016-10-12 03:38:37 -0700 (In reply to comment #14) > Additionally it was broken on Apple Windows and WinCairo bots too. > > Is it a compiler bug in MSVC and GCC? Is C++11/14/17 allows the compiler to > generate Entry::Entry(RefPtr<UniquedStringImpl>, StructureID, bool) > constructor? I found the proper answer for this problem. In C++11 Entry isn't an aggregate because of brace initializers of its members, but it is in C++14. http://stackoverflow.com/questions/35891233/initializing-a-struct-with-aggregate-initialization-and-member-initializers The problem here is that GCC 4.9 and VS 2015 doesn't support NSDMIs for aggregates. 1239234 16 cgarcia 2016-10-12 04:04:35 -0700 (In reply to comment #13) > Fix landed in http://trac.webkit.org/changeset/207213. > > > (In reply to comment #11) > > This broke the build in several linux bots (GTK+, JSCOnly). Maybe something > > not supported by GCC 4.9? > > > > https://build.webkit.org/builders/JSCOnly%20Linux%20ARMv7%20Thumb2%20Release/ > > builds/2318/steps/compile-webkit/logs/stdio > > But the question is why the GTK EWS was green? Do you have different > compiler on the EWS and buildbots? Yes, unfortunately. > It would be great to keep them in sync. Agree 1239863 17 darin 2016-10-13 11:35:31 -0700 I believe the build fix added reference count churn: + Entry(RefPtr<UniquedStringImpl> impl, StructureID structureID, bool result) + : impl(impl) This is not the same thing as the automatically generated behavior, which can do a move if passed a RefPtr&&. 1239865 18 saam 2016-10-13 11:41:03 -0700 (In reply to comment #17) > I believe the build fix added reference count churn: > > + Entry(RefPtr<UniquedStringImpl> impl, StructureID structureID, bool > result) > + : impl(impl) > > This is not the same thing as the automatically generated behavior, which > can do a move if passed a RefPtr&&. Yeah I believe it should always be passed a RefPtr&&. This should be an easy fix. Does the `StructName { ... }` syntax call the constructor? 1239889 19 darin 2016-10-13 12:06:11 -0700 (In reply to comment #18) > Does the `StructName { ... }` syntax call the constructor? Yes. 1239918 20 saam 2016-10-13 12:56:09 -0700 (In reply to comment #19) > (In reply to comment #18) > > Does the `StructName { ... }` syntax call the constructor? > > Yes. Interesting. I had thought the "{ ... }" just individually constructs each field. Do you know what the rules are for it calling a constructor? Must there be a constructor that matches the types? Like StructName{ T1,...,TN } Calls constructor of type ConstructorTye(T1, ..., TN) ? (Ignoring type conversions, etc) 1239925 21 darin 2016-10-13 13:05:57 -0700 (In reply to comment #20) > (In reply to comment #19) > > (In reply to comment #18) > > > Does the `StructName { ... }` syntax call the constructor? > > > > Yes. > > Interesting. I had thought the "{ ... }" just individually constructs each > field. Only if there is no constructor. > Do you know what the rules are for it calling a constructor? An oversimplification: direct initialization of the data members with that syntax works only if there are no constructors. For the full story, C++ reference material recommended. I normally use cppreference.com to look things up. Must there be a > constructor that matches the types? Like > StructName{ T1,...,TN } > Calls constructor of type > ConstructorTye(T1, ..., TN) > ? > (Ignoring type conversions, etc) Yes. In fact, the ClassName { } syntax does not allow many type conversions that the ClassName ( ) syntax performs, which is another benefit of using it. 1240623 22 saam 2016-10-15 13:33:06 -0700 I've opened this bug to go back to move semantics: https://bugs.webkit.org/show_bug.cgi?id=163490 1240624 23 saam 2016-10-15 13:35:10 -0700 (In reply to comment #21) > (In reply to comment #20) > > (In reply to comment #19) > > > (In reply to comment #18) > > > > Does the `StructName { ... }` syntax call the constructor? > > > > > > Yes. > > > > Interesting. I had thought the "{ ... }" just individually constructs each > > field. > > Only if there is no constructor. > > > Do you know what the rules are for it calling a constructor? > > An oversimplification: direct initialization of the data members with that > syntax works only if there are no constructors. For the full story, C++ > reference material recommended. I normally use cppreference.com to look > things up. Interesting. I'll read about this. It's surprising to me because I had just assumed the syntax was more or less shorthand for initializing each field. That was a bad assumption on my part. > > Must there be a > > constructor that matches the types? Like > > StructName{ T1,...,TN } > > Calls constructor of type > > ConstructorTye(T1, ..., TN) > > ? > > (Ignoring type conversions, etc) > > Yes. In fact, the ClassName { } syntax does not allow many type conversions > that the ClassName ( ) syntax performs, which is another benefit of using it. 291295 2016-10-11 14:17:37 -0700 2016-10-11 16:33:18 -0700 patch b-backup.diff text/plain 3589 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MTY0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTEwLTExICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEhhc093blByb3BlcnR5Q2FjaGUgbmVlZHMgdG8gcmVmIHRoZSBVbmlxdWVkU3RyaW5nSW1wbHMg aXQgc2VlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYzMjU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGNhY2hlIG5lZWRzIHRvIGJlIHJlc3BvbnNpYmxlIGZvciBlbnN1cmluZyB0aGF0IHRoaW5n cworICAgICAgICBpbiB0aGUgY2FjaGUgc3RheSBhbGl2ZS4gQmVmb3JlLCBpdCB3YXNuJ3QgZG9p bmcgdGhpcywgYW5kCisgICAgICAgIHRoYXQgd2FzIHdyb25nLgorCisgICAgICAgICogcnVudGlt ZS9IYXNPd25Qcm9wZXJ0eUNhY2hlLmg6CisgICAgICAgIChKU0M6Okhhc093blByb3BlcnR5Q2Fj aGU6OkVudHJ5OjpvcGVyYXRvcj0pOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hl OjpvcGVyYXRvciBkZWxldGUpOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjpj cmVhdGUpOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjpnZXQpOgorICAgICAg ICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjp0cnlBZGQpOgorICAgICAgICAoSlNDOjpIYXNP d25Qcm9wZXJ0eUNhY2hlOjpjbGVhcik6CisgICAgICAgIChKU0M6Okhhc093blByb3BlcnR5Q2Fj aGU6Onplcm9CdWZmZXIpOgorCiAyMDE2LTEwLTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgQWlyIHNob3VsZCBiZSBhYmxlIHRvIHJlcGxhY2UgY29uc3RhbnQg bWF0ZXJpYWxpemF0aW9ucyB3aXRoIGFkZHMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0hhc093blByb3BlcnR5Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9IYXNPd25Qcm9wZXJ0eUNhY2hlLmgJKHJldmlzaW9uIDIwNzE1MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc093blByb3BlcnR5Q2FjaGUuaAko d29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsMTUgQEAgcHVibGljOgogICAgICAgICBzdGF0aWMg cHRyZGlmZl90IG9mZnNldE9mSW1wbCgpIHsgcmV0dXJuIE9CSkVDVF9PRkZTRVRPRihFbnRyeSwg aW1wbCk7IH0KICAgICAgICAgc3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZlJlc3VsdCgpIHsgcmV0 dXJuIE9CSkVDVF9PRkZTRVRPRihFbnRyeSwgcmVzdWx0KTsgfQogCi0gICAgICAgIFVuaXF1ZWRT dHJpbmdJbXBsKiBpbXBsOworICAgICAgICBFbnRyeSYgb3BlcmF0b3I9KEVudHJ5JiYgb3RoZXIp CisgICAgICAgIHsKKyAgICAgICAgICAgIGltcGwgPSBXVEZNb3ZlKG90aGVyLmltcGwpOworICAg ICAgICAgICAgc3RydWN0dXJlSUQgPSBvdGhlci5zdHJ1Y3R1cmVJRDsKKyAgICAgICAgICAgIHJl c3VsdCA9IG90aGVyLnJlc3VsdDsKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKKyAgICAgICAg fQorCisgICAgICAgIFJlZlB0cjxVbmlxdWVkU3RyaW5nSW1wbD4gaW1wbDsKICAgICAgICAgU3Ry dWN0dXJlSUQgc3RydWN0dXJlSUQ7CiAgICAgICAgIGJvb2wgcmVzdWx0OwogICAgIH07CkBAIC01 MSw2ICs1OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgb3BlcmF0b3IgZGVsZXRlKHZvaWQqIGNh Y2hlKQogICAgIHsKKyAgICAgICAgYml0d2lzZV9jYXN0PEhhc093blByb3BlcnR5Q2FjaGUqPihj YWNoZSktPmNsZWFyKCk7CiAgICAgICAgIGZhc3RGcmVlKGNhY2hlKTsKICAgICB9CiAKQEAgLTU4 LDcgKzY3LDcgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgc2l6ZV90IGFsbG9jYXRpb25TaXpl ID0gc2l6ZW9mKEVudHJ5KSAqIHNpemU7CiAgICAgICAgIEhhc093blByb3BlcnR5Q2FjaGUqIHJl c3VsdCA9IHN0YXRpY19jYXN0PEhhc093blByb3BlcnR5Q2FjaGUqPihmYXN0TWFsbG9jKGFsbG9j YXRpb25TaXplKSk7Ci0gICAgICAgIHJlc3VsdC0+Y2xlYXIoKTsKKyAgICAgICAgcmVzdWx0LT56 ZXJvQnVmZmVyKCk7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCkBAIC03Myw3ICs4 Miw3IEBAIHB1YmxpYzoKICAgICAgICAgU3RydWN0dXJlSUQgaWQgPSBzdHJ1Y3R1cmUtPmlkKCk7 CiAgICAgICAgIHVpbnQzMl90IGluZGV4ID0gSGFzT3duUHJvcGVydHlDYWNoZTo6aGFzaChpZCwg aW1wbCkgJiBtYXNrOwogICAgICAgICBFbnRyeSYgZW50cnkgPSBiaXR3aXNlX2Nhc3Q8RW50cnkq Pih0aGlzKVtpbmRleF07Ci0gICAgICAgIGlmIChlbnRyeS5zdHJ1Y3R1cmVJRCA9PSBpZCAmJiBl bnRyeS5pbXBsID09IGltcGwpCisgICAgICAgIGlmIChlbnRyeS5zdHJ1Y3R1cmVJRCA9PSBpZCAm JiBlbnRyeS5pbXBsLmdldCgpID09IGltcGwpCiAgICAgICAgICAgICByZXR1cm4gZW50cnkucmVz dWx0OwogICAgICAgICByZXR1cm4gTnVsbG9wdDsKICAgICB9CkBAIC0xMDQsMTIgKzExMywyMyBA QCBwdWJsaWM6CiAgICAgICAgICAgICBVbmlxdWVkU3RyaW5nSW1wbCogaW1wbCA9IHByb3BOYW1l LnVpZCgpOwogICAgICAgICAgICAgU3RydWN0dXJlSUQgaWQgPSBzdHJ1Y3R1cmUtPmlkKCk7CiAg ICAgICAgICAgICB1aW50MzJfdCBpbmRleCA9IEhhc093blByb3BlcnR5Q2FjaGU6Omhhc2goaWQs IGltcGwpICYgbWFzazsKLSAgICAgICAgICAgIGJpdHdpc2VfY2FzdDxFbnRyeSo+KHRoaXMpW2lu ZGV4XSA9IEVudHJ5eyBpbXBsLCBpZCwgcmVzdWx0IH07CisgICAgICAgICAgICBiaXR3aXNlX2Nh c3Q8RW50cnkqPih0aGlzKVtpbmRleF0gPSBFbnRyeXsgUmVmUHRyPFVuaXF1ZWRTdHJpbmdJbXBs PihpbXBsKSwgaWQsIHJlc3VsdCB9OwogICAgICAgICB9CiAgICAgfQogCiAgICAgdm9pZCBjbGVh cigpCiAgICAgeworICAgICAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKQor ICAgICAgICAgICAgYml0d2lzZV9jYXN0PEVudHJ5Kj4odGhpcylbaV0uRW50cnk6On5FbnRyeSgp OworCisgICAgICAgIHplcm9CdWZmZXIoKTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgdm9pZCB6 ZXJvQnVmZmVyKCkKKyAgICB7CisgICAgICAgIC8vIE5vdGUgdGhhdCBtZW1zZXR0aW5nIGEgUmVm UHRyPFQ+IHRvIHplcm8gcHV0cyBpdCBpbnRvIHRoZSBzYW1lIHN0YXRlCisgICAgICAgIC8vIGFz IGlmIHdlIGNvbnN0cnVjdGVkIGl0IHVzaW5nIGl0cyBkZWZhdWx0IGNvbnN0cnVjdG9yLgogICAg ICAgICBtZW1zZXQodGhpcywgMCwgc2l6ZW9mKEVudHJ5KSAqIHNpemUpOwogICAgIH0KIH07Cg== 291315 2016-10-11 16:33:18 -0700 2016-10-11 20:17:32 -0700 patch for landing b-backup.diff text/plain 3735 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MTY0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTEwLTExICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEhhc093blByb3BlcnR5Q2FjaGUgbmVlZHMgdG8gcmVmIHRoZSBVbmlxdWVkU3RyaW5nSW1wbHMg aXQgc2VlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYzMjU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAg VGhlIGNhY2hlIG5lZWRzIHRvIGJlIHJlc3BvbnNpYmxlIGZvciBlbnN1cmluZyB0aGF0IHRoaW5n cworICAgICAgICBpbiB0aGUgY2FjaGUgc3RheSBhbGl2ZS4gQmVmb3JlLCBpdCB3YXNuJ3QgZG9p bmcgdGhpcywgYW5kCisgICAgICAgIHRoYXQgd2FzIHdyb25nLgorCisgICAgICAgICogcnVudGlt ZS9IYXNPd25Qcm9wZXJ0eUNhY2hlLmg6CisgICAgICAgIChKU0M6Okhhc093blByb3BlcnR5Q2Fj aGU6OkVudHJ5OjpvcGVyYXRvcj0pOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hl OjpvcGVyYXRvciBkZWxldGUpOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjpj cmVhdGUpOgorICAgICAgICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjpnZXQpOgorICAgICAg ICAoSlNDOjpIYXNPd25Qcm9wZXJ0eUNhY2hlOjp0cnlBZGQpOgorICAgICAgICAoSlNDOjpIYXNP d25Qcm9wZXJ0eUNhY2hlOjpjbGVhcik6CisgICAgICAgIChKU0M6Okhhc093blByb3BlcnR5Q2Fj aGU6Onplcm9CdWZmZXIpOgorCiAyMDE2LTEwLTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgQWlyIHNob3VsZCBiZSBhYmxlIHRvIHJlcGxhY2UgY29uc3RhbnQg bWF0ZXJpYWxpemF0aW9ucyB3aXRoIGFkZHMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0hhc093blByb3BlcnR5Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9IYXNPd25Qcm9wZXJ0eUNhY2hlLmgJKHJldmlzaW9uIDIwNzE1MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc093blByb3BlcnR5Q2FjaGUuaAko d29ya2luZyBjb3B5KQpAQCAtNDIsMTUgKzQyLDI2IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGlj IHB0cmRpZmZfdCBvZmZzZXRPZkltcGwoKSB7IHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoRW50cnks IGltcGwpOyB9CiAgICAgICAgIHN0YXRpYyBwdHJkaWZmX3Qgb2Zmc2V0T2ZSZXN1bHQoKSB7IHJl dHVybiBPQkpFQ1RfT0ZGU0VUT0YoRW50cnksIHJlc3VsdCk7IH0KIAotICAgICAgICBVbmlxdWVk U3RyaW5nSW1wbCogaW1wbDsKLSAgICAgICAgU3RydWN0dXJlSUQgc3RydWN0dXJlSUQ7Ci0gICAg ICAgIGJvb2wgcmVzdWx0OworICAgICAgICBFbnRyeSgpID0gZGVmYXVsdDsKKworICAgICAgICBF bnRyeSYgb3BlcmF0b3I9KEVudHJ5JiYgb3RoZXIpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlt cGwgPSBXVEZNb3ZlKG90aGVyLmltcGwpOworICAgICAgICAgICAgc3RydWN0dXJlSUQgPSBvdGhl ci5zdHJ1Y3R1cmVJRDsKKyAgICAgICAgICAgIHJlc3VsdCA9IG90aGVyLnJlc3VsdDsKKyAgICAg ICAgICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfQorCisgICAgICAgIFJlZlB0cjxVbmlxdWVk U3RyaW5nSW1wbD4gaW1wbCB7IH07CisgICAgICAgIFN0cnVjdHVyZUlEIHN0cnVjdHVyZUlEIHsg MCB9OworICAgICAgICBib29sIHJlc3VsdCB7IGZhbHNlIH07CiAgICAgfTsKIAogICAgIEhhc093 blByb3BlcnR5Q2FjaGUoKSA9IGRlbGV0ZTsKIAogICAgIHZvaWQgb3BlcmF0b3IgZGVsZXRlKHZv aWQqIGNhY2hlKQogICAgIHsKKyAgICAgICAgc3RhdGljX2Nhc3Q8SGFzT3duUHJvcGVydHlDYWNo ZSo+KGNhY2hlKS0+Y2xlYXIoKTsKICAgICAgICAgZmFzdEZyZWUoY2FjaGUpOwogICAgIH0KIApA QCAtNTgsNyArNjksNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBzaXplX3QgYWxsb2NhdGlv blNpemUgPSBzaXplb2YoRW50cnkpICogc2l6ZTsKICAgICAgICAgSGFzT3duUHJvcGVydHlDYWNo ZSogcmVzdWx0ID0gc3RhdGljX2Nhc3Q8SGFzT3duUHJvcGVydHlDYWNoZSo+KGZhc3RNYWxsb2Mo YWxsb2NhdGlvblNpemUpKTsKLSAgICAgICAgcmVzdWx0LT5jbGVhcigpOworICAgICAgICByZXN1 bHQtPmNsZWFyQnVmZmVyKCk7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCkBAIC03 Myw3ICs4NCw3IEBAIHB1YmxpYzoKICAgICAgICAgU3RydWN0dXJlSUQgaWQgPSBzdHJ1Y3R1cmUt PmlkKCk7CiAgICAgICAgIHVpbnQzMl90IGluZGV4ID0gSGFzT3duUHJvcGVydHlDYWNoZTo6aGFz aChpZCwgaW1wbCkgJiBtYXNrOwogICAgICAgICBFbnRyeSYgZW50cnkgPSBiaXR3aXNlX2Nhc3Q8 RW50cnkqPih0aGlzKVtpbmRleF07Ci0gICAgICAgIGlmIChlbnRyeS5zdHJ1Y3R1cmVJRCA9PSBp ZCAmJiBlbnRyeS5pbXBsID09IGltcGwpCisgICAgICAgIGlmIChlbnRyeS5zdHJ1Y3R1cmVJRCA9 PSBpZCAmJiBlbnRyeS5pbXBsLmdldCgpID09IGltcGwpCiAgICAgICAgICAgICByZXR1cm4gZW50 cnkucmVzdWx0OwogICAgICAgICByZXR1cm4gTnVsbG9wdDsKICAgICB9CkBAIC0xMDQsMTMgKzEx NSwyNSBAQCBwdWJsaWM6CiAgICAgICAgICAgICBVbmlxdWVkU3RyaW5nSW1wbCogaW1wbCA9IHBy b3BOYW1lLnVpZCgpOwogICAgICAgICAgICAgU3RydWN0dXJlSUQgaWQgPSBzdHJ1Y3R1cmUtPmlk KCk7CiAgICAgICAgICAgICB1aW50MzJfdCBpbmRleCA9IEhhc093blByb3BlcnR5Q2FjaGU6Omhh c2goaWQsIGltcGwpICYgbWFzazsKLSAgICAgICAgICAgIGJpdHdpc2VfY2FzdDxFbnRyeSo+KHRo aXMpW2luZGV4XSA9IEVudHJ5eyBpbXBsLCBpZCwgcmVzdWx0IH07CisgICAgICAgICAgICBiaXR3 aXNlX2Nhc3Q8RW50cnkqPih0aGlzKVtpbmRleF0gPSBFbnRyeXsgUmVmUHRyPFVuaXF1ZWRTdHJp bmdJbXBsPihpbXBsKSwgaWQsIHJlc3VsdCB9OwogICAgICAgICB9CiAgICAgfQogCiAgICAgdm9p ZCBjbGVhcigpCiAgICAgewotICAgICAgICBtZW1zZXQodGhpcywgMCwgc2l6ZW9mKEVudHJ5KSAq IHNpemUpOworICAgICAgICBFbnRyeSogYnVmZmVyID0gYml0d2lzZV9jYXN0PEVudHJ5Kj4odGhp cyk7CisgICAgICAgIGZvciAodWludDMyX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCisgICAgICAg ICAgICBidWZmZXJbaV0uRW50cnk6On5FbnRyeSgpOworCisgICAgICAgIGNsZWFyQnVmZmVyKCk7 CisgICAgfQorCitwcml2YXRlOgorICAgIHZvaWQgY2xlYXJCdWZmZXIoKQorICAgIHsKKyAgICAg ICAgRW50cnkqIGJ1ZmZlciA9IGJpdHdpc2VfY2FzdDxFbnRyeSo+KHRoaXMpOworICAgICAgICBm b3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKQorICAgICAgICAgICAgbmV3ICgmYnVm ZmVyW2ldKSBFbnRyeSgpOwogICAgIH0KIH07CiAK