177952 2017-10-05 10:57:10 -0700 Only add prototypes to the PrototypeMap if they're not already present 2017-10-07 12:18:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore Safari Technology Preview Unspecified Unspecified RESOLVED DUPLICATE 177907 InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ryanhaddad ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1357093 0 saam 2017-10-05 10:57:10 -0700 It's cheaper to check if the thing isn't in the prototype map since allocating a Weak is expensive. 1357111 1 322865 saam 2017-10-05 11:21:18 -0700 Created attachment 322865 patch 1357114 2 322865 msaboff 2017-10-05 11:22:51 -0700 Comment on attachment 322865 patch r=me 1357115 3 322865 jfbastien 2017-10-05 11:23:06 -0700 Comment on attachment 322865 patch View in context: https://bugs.webkit.org/attachment.cgi?id=322865&action=review > Source/JavaScriptCore/runtime/PrototypeMapInlines.h:48 > + m_prototypes.set(object, object); Doesn't this do the search twice? Can you use the result iterator from the search instead? 1357127 4 saam 2017-10-05 11:37:40 -0700 (In reply to JF Bastien from comment #3) > Comment on attachment 322865 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=322865&action=review > > > Source/JavaScriptCore/runtime/PrototypeMapInlines.h:48 > > + m_prototypes.set(object, object); > > Doesn't this do the search twice? Can you use the result iterator from the > search instead? Yeah, this is the optimal thing to do. I'll add the necessary API to WeakMap to allow this to happen. 1357135 5 322873 saam 2017-10-05 11:47:40 -0700 Created attachment 322873 patch for landing 1357172 6 322873 jfbastien 2017-10-05 12:31:38 -0700 Comment on attachment 322873 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=322873&action=review r=me > Source/JavaScriptCore/runtime/PrototypeMapInlines.h:47 > + auto addResult = m_prototypes.add(object, Weak<JSObject>()); Saam, using auto‽ 1357177 7 saam 2017-10-05 12:46:00 -0700 (In reply to JF Bastien from comment #6) > Comment on attachment 322873 [details] > patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=322873&action=review > > r=me > > > Source/JavaScriptCore/runtime/PrototypeMapInlines.h:47 > > + auto addResult = m_prototypes.add(object, Weak<JSObject>()); > > Saam, using auto‽ Always for addResult 😎 1357181 8 322873 commit-queue 2017-10-05 12:58:11 -0700 Comment on attachment 322873 patch for landing Clearing flags on attachment: 322873 Committed r222929: <http://trac.webkit.org/changeset/222929> 1357182 9 commit-queue 2017-10-05 12:58:13 -0700 All reviewed patches have been landed. Closing bug. 1357183 10 webkit-bug-importer 2017-10-05 12:59:09 -0700 <rdar://problem/34840746> 1357267 11 ryanhaddad 2017-10-05 15:06:19 -0700 This change caused LayoutTests to exit early with an assertion failure: https://build.webkit.org/results/Apple%20Sierra%20Debug%20WK2%20(Tests)/r222929%20(3378)/results.html ASSERTION FAILED: addResult.iterator->value.get() == object ./runtime/PrototypeMapInlines.h(51) : void JSC::PrototypeMap::addPrototype(JSC::JSObject *) 1 0x118ffb06d WTFCrash 2 0x117d5009d JSC::PrototypeMap::addPrototype(JSC::JSObject*) 3 0x117f657e0 JSC::ObjectPrototype::finishCreation(JSC::VM&, JSC::JSGlobalObject*) 4 0x117f67ffe JSC::ObjectPrototype::create(JSC::VM&, JSC::JSGlobalObject*, JSC::Structure*) 5 0x117d8bf6d JSC::JSGlobalObject::init(JSC::VM&) 6 0x117daae7c JSC::JSGlobalObject::finishCreation(JSC::VM&, JSC::JSObject*) 7 0x10d1220fa WebCore::JSDOMGlobalObject::finishCreation(JSC::VM&, JSC::JSObject*) 8 0x10d271058 WebCore::JSDOMWindowBase::finishCreation(JSC::VM&, WebCore::JSDOMWindowProxy*) 9 0x10d19f9b6 WebCore::JSDOMWindow::finishCreation(JSC::VM&, WebCore::JSDOMWindowProxy*) 10 0x10d27a664 WebCore::JSDOMWindow::create(JSC::VM&, JSC::Structure*, WTF::Ref<WebCore::DOMWindow>&&, WebCore::JSDOMWindowProxy*) 11 0x10d27a127 WebCore::JSDOMWindowProxy::setWindow(WTF::RefPtr<WebCore::DOMWindow>&&) 12 0x10e48d30e WebCore::ScriptController::setDOMWindowForWindowProxy(WebCore::DOMWindow*) 13 0x10c8a5c05 WebCore::FrameLoader::clear(WebCore::Document*, bool, bool, bool) 14 0x10c57a739 WebCore::DocumentWriter::begin(WebCore::URL const&, bool, WebCore::Document*) 15 0x10c530f8e WebCore::DocumentLoader::commitData(char const*, unsigned long) 16 0x10c530a25 WebCore::DocumentLoader::finishedLoading() 17 0x10c537e25 WebCore::DocumentLoader::maybeLoadEmpty() 18 0x10c537fad WebCore::DocumentLoader::startLoadingMainResource() 19 0x10c8c0165 WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&, WebCore::FormState*, bool, WebCore::AllowNavigationToInvalidURL)::$_7::operator()() const 20 0x10c8bfeb9 WTF::Function<void ()>::CallableWrapper<WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&, WebCore::FormState*, bool, WebCore::AllowNavigationToInvalidURL)::$_7>::call() 21 0x10bd9d9db WTF::Function<void ()>::operator()() const 22 0x10c8ac80d WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&, WebCore::FormState*, bool, WebCore::AllowNavigationToInvalidURL) 23 0x10c8be9e8 WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, WebCore::FrameLoadType, WebCore::FormState*, WebCore::AllowNavigationToInvalidURL)::$_5::operator()(WebCore::ResourceRequest const&, WebCore::FormState*, bool) const 24 0x10c8be972 WTF::Function<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>::CallableWrapper<WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, WebCore::FrameLoadType, WebCore::FormState*, WebCore::AllowNavigationToInvalidURL)::$_5>::call(WebCore::ResourceRequest const&, WebCore::FormState*, bool) 25 0x10dfd3bad WTF::Function<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>::operator()(WebCore::ResourceRequest const&, WebCore::FormState*, bool) const 26 0x10dfd2bc9 WTF::CompletionHandler<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>::operator()(WebCore::ResourceRequest const&, WebCore::FormState*, bool) 27 0x10dfd60b9 WebCore::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest const&, bool, WebCore::DocumentLoader*, WebCore::FormState*, WTF::CompletionHandler<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>&&)::$_1::operator()(WebCore::PolicyAction) 28 0x10dfd5c8a WTF::Function<void (WebCore::PolicyAction)>::CallableWrapper<WebCore::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest const&, bool, WebCore::DocumentLoader*, WebCore::FormState*, WTF::CompletionHandler<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>&&)::$_1>::call(WebCore::PolicyAction) 29 0x1055d10b1 WTF::Function<void (WebCore::PolicyAction)>::operator()(WebCore::PolicyAction) const 30 0x105cf69c5 WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(WebCore::NavigationAction const&, WebCore::ResourceRequest const&, bool, WebCore::FormState*, WTF::Function<void (WebCore::PolicyAction)>&&) 31 0x10dfd2a3a WebCore::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest const&, bool, WebCore::DocumentLoader*, WebCore::FormState*, WTF::CompletionHandler<void (WebCore::ResourceRequest const&, WebCore::FormState*, bool)>&&) LEAK: 1 WebPageProxy 1357275 12 saam 2017-10-05 15:16:09 -0700 (In reply to Ryan Haddad from comment #11) > This change caused LayoutTests to exit early with an assertion failure: > https://build.webkit.org/results/Apple%20Sierra%20Debug%20WK2%20(Tests)/ > r222929%20(3378)/results.html > > ASSERTION FAILED: addResult.iterator->value.get() == object > ./runtime/PrototypeMapInlines.h(51) : void > JSC::PrototypeMap::addPrototype(JSC::JSObject *) > 1 0x118ffb06d WTFCrash > 2 0x117d5009d JSC::PrototypeMap::addPrototype(JSC::JSObject*) > 3 0x117f657e0 JSC::ObjectPrototype::finishCreation(JSC::VM&, > JSC::JSGlobalObject*) > 4 0x117f67ffe JSC::ObjectPrototype::create(JSC::VM&, JSC::JSGlobalObject*, > JSC::Structure*) > 5 0x117d8bf6d JSC::JSGlobalObject::init(JSC::VM&) > 6 0x117daae7c JSC::JSGlobalObject::finishCreation(JSC::VM&, JSC::JSObject*) > 7 0x10d1220fa WebCore::JSDOMGlobalObject::finishCreation(JSC::VM&, > JSC::JSObject*) > 8 0x10d271058 WebCore::JSDOMWindowBase::finishCreation(JSC::VM&, > WebCore::JSDOMWindowProxy*) > 9 0x10d19f9b6 WebCore::JSDOMWindow::finishCreation(JSC::VM&, > WebCore::JSDOMWindowProxy*) > 10 0x10d27a664 WebCore::JSDOMWindow::create(JSC::VM&, JSC::Structure*, > WTF::Ref<WebCore::DOMWindow>&&, WebCore::JSDOMWindowProxy*) > 11 0x10d27a127 > WebCore::JSDOMWindowProxy::setWindow(WTF::RefPtr<WebCore::DOMWindow>&&) > 12 0x10e48d30e > WebCore::ScriptController::setDOMWindowForWindowProxy(WebCore::DOMWindow*) > 13 0x10c8a5c05 WebCore::FrameLoader::clear(WebCore::Document*, bool, bool, > bool) > 14 0x10c57a739 WebCore::DocumentWriter::begin(WebCore::URL const&, bool, > WebCore::Document*) > 15 0x10c530f8e WebCore::DocumentLoader::commitData(char const*, unsigned > long) > 16 0x10c530a25 WebCore::DocumentLoader::finishedLoading() > 17 0x10c537e25 WebCore::DocumentLoader::maybeLoadEmpty() > 18 0x10c537fad WebCore::DocumentLoader::startLoadingMainResource() > 19 0x10c8c0165 > WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore:: > ResourceRequest const&, WebCore::FormState*, bool, > WebCore::AllowNavigationToInvalidURL)::$_7::operator()() const > 20 0x10c8bfeb9 WTF::Function<void > ()>::CallableWrapper<WebCore::FrameLoader:: > continueLoadAfterNavigationPolicy(WebCore::ResourceRequest const&, > WebCore::FormState*, bool, > WebCore::AllowNavigationToInvalidURL)::$_7>::call() > 21 0x10bd9d9db WTF::Function<void ()>::operator()() const > 22 0x10c8ac80d > WebCore::FrameLoader::continueLoadAfterNavigationPolicy(WebCore:: > ResourceRequest const&, WebCore::FormState*, bool, > WebCore::AllowNavigationToInvalidURL) > 23 0x10c8be9e8 > WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, > WebCore::FrameLoadType, WebCore::FormState*, > WebCore::AllowNavigationToInvalidURL)::$_5::operator()(WebCore:: > ResourceRequest const&, WebCore::FormState*, bool) const > 24 0x10c8be972 WTF::Function<void (WebCore::ResourceRequest const&, > WebCore::FormState*, > bool)>::CallableWrapper<WebCore::FrameLoader::loadWithDocumentLoader(WebCore: > :DocumentLoader*, WebCore::FrameLoadType, WebCore::FormState*, > WebCore::AllowNavigationToInvalidURL)::$_5>::call(WebCore::ResourceRequest > const&, WebCore::FormState*, bool) > 25 0x10dfd3bad WTF::Function<void (WebCore::ResourceRequest const&, > WebCore::FormState*, bool)>::operator()(WebCore::ResourceRequest const&, > WebCore::FormState*, bool) const > 26 0x10dfd2bc9 WTF::CompletionHandler<void (WebCore::ResourceRequest > const&, WebCore::FormState*, bool)>::operator()(WebCore::ResourceRequest > const&, WebCore::FormState*, bool) > 27 0x10dfd60b9 > WebCore::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest > const&, bool, WebCore::DocumentLoader*, WebCore::FormState*, > WTF::CompletionHandler<void (WebCore::ResourceRequest const&, > WebCore::FormState*, bool)>&&)::$_1::operator()(WebCore::PolicyAction) > 28 0x10dfd5c8a WTF::Function<void > (WebCore::PolicyAction)>::CallableWrapper<WebCore::PolicyChecker:: > checkNavigationPolicy(WebCore::ResourceRequest const&, bool, > WebCore::DocumentLoader*, WebCore::FormState*, WTF::CompletionHandler<void > (WebCore::ResourceRequest const&, WebCore::FormState*, > bool)>&&)::$_1>::call(WebCore::PolicyAction) > 29 0x1055d10b1 WTF::Function<void > (WebCore::PolicyAction)>::operator()(WebCore::PolicyAction) const > 30 0x105cf69c5 > WebKit::WebFrameLoaderClient:: > dispatchDecidePolicyForNavigationAction(WebCore::NavigationAction const&, > WebCore::ResourceRequest const&, bool, WebCore::FormState*, > WTF::Function<void (WebCore::PolicyAction)>&&) > 31 0x10dfd2a3a > WebCore::PolicyChecker::checkNavigationPolicy(WebCore::ResourceRequest > const&, bool, WebCore::DocumentLoader*, WebCore::FormState*, > WTF::CompletionHandler<void (WebCore::ResourceRequest const&, > WebCore::FormState*, bool)>&&) > LEAK: 1 WebPageProxy Looking into it. This is really surprising. 1357296 13 saam 2017-10-05 15:46:30 -0700 This is the bug: ``` void Heap::pruneStaleEntriesFromWeakGCMaps() { if (m_collectionScope != CollectionScope::Full) return; for (auto& pruneCallback : m_weakGCMaps.values()) pruneCallback(); } ``` But the WeakGCMap we use is: WeakGCMap<JSObject*, JSObject*> which really is HashMap<JSObject*, Weak<JSObject>> It's really suspicious we don't clear entries in this map on every GC. I'm working on a more fundamental fix in: https://bugs.webkit.org/show_bug.cgi?id=177907 1357297 14 ryanhaddad 2017-10-05 15:52:33 -0700 Reverted r222929 for reason: Caused assertion failures during LayoutTests. Committed r222939: <http://trac.webkit.org/changeset/222939> 1357301 15 saam 2017-10-05 15:57:43 -0700 *** This bug has been marked as a duplicate of bug 177907 *** 1357940 16 fpizlo 2017-10-07 12:16:54 -0700 (In reply to Saam Barati from comment #13) > This is the bug: > > ``` > void Heap::pruneStaleEntriesFromWeakGCMaps() > { > if (m_collectionScope != CollectionScope::Full) > return; > for (auto& pruneCallback : m_weakGCMaps.values()) > pruneCallback(); > } > ``` > But the WeakGCMap we use is: > WeakGCMap<JSObject*, JSObject*> > > which really is > HashMap<JSObject*, Weak<JSObject>> > > It's really suspicious we don't clear entries in this map on every GC. I'm > working on a more fundamental fix in: > https://bugs.webkit.org/show_bug.cgi?id=177907 No, your patch was wrong. You should have said: auto addResult = m_prototypes.add(object, Weak<JSObject>()); if (addResult.isNewEntry || !addResult.iterator->value) addResult.iterator->value = Weak<JSObject>(object); else ASSERT(addResult.iterator->value.get() == object); Pruning a WeakGCMap is an optimization. All methods in WeakGCMap must assume that an entry with a null value is as if the entry was not there at all. 1357942 17 322873 fpizlo 2017-10-07 12:18:06 -0700 Comment on attachment 322873 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=322873&action=review > Source/JavaScriptCore/runtime/PrototypeMapInlines.h:48 > + if (addResult.isNewEntry) This should have also checked if the value is null. 1357943 18 fpizlo 2017-10-07 12:18:20 -0700 I'll fix this in https://bugs.webkit.org/show_bug.cgi?id=178051 322865 2017-10-05 11:21:18 -0700 2017-10-05 11:47:40 -0700 patch c-backup.diff text/plain 1927 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIyOTIwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE3LTEwLTA1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE9ubHkgYWRkIHByb3RvdHlwZXMgdG8gdGhlIFByb3RvdHlwZU1hcCBpZiB0aGV5J3JlIG5vdCBh bHJlYWR5IHByZXNlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3Nzk1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdpdGggcG9seSBwcm90bywgd2UgbmVlZCB0byBjYWxsIFByb3RvdHlwZU1hcDo6YWRk IG1vcmUgZnJlcXVlbnRseSBzaW5jZSB3ZSBkb24ndAorICAgICAgICBrbm93IGlmIHRoZSBwcm90 b3R5cGUgaXMgYWxyZWFkeSBpbiB0aGUgbWFwIG9yIG5vdCBiYXNlZCBzb2xlbHkgb24gU3RydWN0 dXJlLgorICAgICAgICBQcm90b3R5cGVNYXA6OmFkZCB3YXMgY2FsbGluZyBXZWFrTWFwOjpzZXQg dW5jb25kaXRpb25hbGx5LCB3aGljaCB3b3VsZCB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAgYWxs b2NhdGUgYSBXZWFrIGhhbmRsZS4gQWxsb2NhdGluZyBhIFdlYWsgaGFuZGxlIGlzIGV4cGVuc2l2 ZS4gSXQncyBhdCBsZWFzdCA4eCBtb3JlCisgICAgICAgIGV4cGVuc2l2ZSB0aGFuIGp1c3QgY2hl Y2tpbmcgaWYgdGhlIHByb3RvdHlwZSBpcyBpbiB0aGUgbWFwIHByaW9yIHRvIGFkZGluZyBpdC4g VGhpcworICAgICAgICBwYXRjaCBtYWtlcyB0aGUgY2hhbmdlIHRvIG9ubHkgYWRkIHRoZSBwcm90 b3R5cGUgaWYgaXQncyBub3QgYWxyZWFkeSBpbiB0aGUgbWFwLgorCisgICAgICAgICogcnVudGlt ZS9Qcm90b3R5cGVNYXBJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OlByb3RvdHlwZU1hcDo6YWRk UHJvdG90eXBlKToKKwogMjAxNy0xMC0wNSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNv bT4KIAogICAgICAgICBNYWtlIHN1cmUgYWxsIHByb3RvdHlwZXMgdW5kZXIgcG9seSBwcm90byBn ZXQgYWRkZWQgaW50byB0aGUgVk0ncyBwcm90b3R5cGUgbWFwCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9Qcm90b3R5cGVNYXBJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvdG90eXBlTWFwSW5saW5lcy5oCShyZXZpc2lv biAyMjI5MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm90b3R5cGVNYXBJ bmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDggQEAgQUxXQVlTX0lOTElORSBU cmlTdGF0ZSBQcm90b3R5cGVNYXA6OmlzUAogCiBBTFdBWVNfSU5MSU5FIHZvaWQgUHJvdG90eXBl TWFwOjphZGRQcm90b3R5cGUoSlNPYmplY3QqIG9iamVjdCkKIHsKLSAgICBtX3Byb3RvdHlwZXMu c2V0KG9iamVjdCwgb2JqZWN0KTsKKyAgICBpZiAoIW1fcHJvdG90eXBlcy5jb250YWlucyhvYmpl Y3QpKQorICAgICAgICBtX3Byb3RvdHlwZXMuc2V0KG9iamVjdCwgb2JqZWN0KTsKIAogICAgIC8v IE5vdGUgdGhhdCB0aGlzIG1ldGhvZCBtYWtlcyB0aGUgc29tZXdoYXQgb2RkIGRlY2lzaW9uIHRv IG5vdCBjaGVjayBpZiB0aGlzCiAgICAgLy8gb2JqZWN0IGN1cnJlbnRseSBoYXMgaW5kZXhlZCBh Y2Nlc3NvcnMuIFdlIGNvdWxkIGRvIHRoYXQgY2hlY2sgaGVyZSwgYW5kIGlmCg== 322873 2017-10-05 11:47:40 -0700 2017-10-05 12:58:11 -0700 patch for landing c-backup.diff text/plain 2909 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIyOTIwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE3LTEwLTA1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE9ubHkgYWRkIHByb3RvdHlwZXMgdG8gdGhlIFByb3RvdHlwZU1hcCBpZiB0aGV5J3JlIG5vdCBh bHJlYWR5IHByZXNlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3Nzk1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmIGFuZCBK RiBCYXN0aWVuLgorCisgICAgICAgIFdpdGggcG9seSBwcm90bywgd2UgbmVlZCB0byBjYWxsIFBy b3RvdHlwZU1hcDo6YWRkIG1vcmUgZnJlcXVlbnRseSBzaW5jZSB3ZSBkb24ndAorICAgICAgICBr bm93IGlmIHRoZSBwcm90b3R5cGUgaXMgYWxyZWFkeSBpbiB0aGUgbWFwIG9yIG5vdCBiYXNlZCBz b2xlbHkgb24gU3RydWN0dXJlLgorICAgICAgICBQcm90b3R5cGVNYXA6OmFkZCB3YXMgY2FsbGlu ZyBXZWFrTWFwOjpzZXQgdW5jb25kaXRpb25hbGx5LCB3aGljaCB3b3VsZCB1bmNvbmRpdGlvbmFs bHkKKyAgICAgICAgYWxsb2NhdGUgYSBXZWFrIGhhbmRsZS4gQWxsb2NhdGluZyBhIFdlYWsgaGFu ZGxlIGlzIGV4cGVuc2l2ZS4gSXQncyBhdCBsZWFzdCA4eCBtb3JlCisgICAgICAgIGV4cGVuc2l2 ZSB0aGFuIGp1c3QgY2hlY2tpbmcgaWYgdGhlIHByb3RvdHlwZSBpcyBpbiB0aGUgbWFwIHByaW9y IHRvIGFkZGluZyBpdC4gVGhpcworICAgICAgICBwYXRjaCBtYWtlcyB0aGUgY2hhbmdlIHRvIG9u bHkgYWRkIHRoZSBwcm90b3R5cGUgaWYgaXQncyBub3QgYWxyZWFkeSBpbiB0aGUgbWFwLiBUbwor ICAgICAgICBkbyB0aGlzLCBJJ3ZlIGFkZGVkIGEgV2Vha01hcDo6YWRkIEFQSSB0aGF0IGp1c3Qg Zm9yd2FyZHMgaW50byBIYXNoTWFwJ3MgYWRkIEFQSS4KKyAgICAgICAgVGhpcyBhbGxvd3MgdXMg dG8gYm90aCBvbmx5IGRvIGEgc2luZ2xlIGhhc2ggdGFibGUgbG9va3VwIGFuZCBhbHNvIHRvIGFs bG9jYXRlIG9ubHkKKyAgICAgICAgYSBzaW5nbGUgV2VhayBoYW5kbGUgd2hlbiBuZWNlc3Nhcnku CisKKyAgICAgICAgKiBydW50aW1lL1Byb3RvdHlwZU1hcElubGluZXMuaDoKKyAgICAgICAgKEpT Qzo6UHJvdG90eXBlTWFwOjphZGRQcm90b3R5cGUpOgorICAgICAgICAqIHJ1bnRpbWUvV2Vha0dD TWFwLmg6CisgICAgICAgIChKU0M6OldlYWtHQ01hcDo6YWRkKToKKwogMjAxNy0xMC0wNSAgU2Fh bSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgYWxsIHBy b3RvdHlwZXMgdW5kZXIgcG9seSBwcm90byBnZXQgYWRkZWQgaW50byB0aGUgVk0ncyBwcm90b3R5 cGUgbWFwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm90b3R5cGVNYXBJ bmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJv dG90eXBlTWFwSW5saW5lcy5oCShyZXZpc2lvbiAyMjI5MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Qcm90b3R5cGVNYXBJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0 LDcgKzQ0LDExIEBAIEFMV0FZU19JTkxJTkUgVHJpU3RhdGUgUHJvdG90eXBlTWFwOjppc1AKIAog QUxXQVlTX0lOTElORSB2b2lkIFByb3RvdHlwZU1hcDo6YWRkUHJvdG90eXBlKEpTT2JqZWN0KiBv YmplY3QpCiB7Ci0gICAgbV9wcm90b3R5cGVzLnNldChvYmplY3QsIG9iamVjdCk7CisgICAgYXV0 byBhZGRSZXN1bHQgPSBtX3Byb3RvdHlwZXMuYWRkKG9iamVjdCwgV2VhazxKU09iamVjdD4oKSk7 CisgICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQorICAgICAgICBhZGRSZXN1bHQuaXRlcmF0 b3ItPnZhbHVlID0gV2VhazxKU09iamVjdD4ob2JqZWN0KTsKKyAgICBlbHNlCisgICAgICAgIEFT U0VSVChhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdldCgpID09IG9iamVjdCk7CiAKICAgICAv LyBOb3RlIHRoYXQgdGhpcyBtZXRob2QgbWFrZXMgdGhlIHNvbWV3aGF0IG9kZCBkZWNpc2lvbiB0 byBub3QgY2hlY2sgaWYgdGhpcwogICAgIC8vIG9iamVjdCBjdXJyZW50bHkgaGFzIGluZGV4ZWQg YWNjZXNzb3JzLiBXZSBjb3VsZCBkbyB0aGF0IGNoZWNrIGhlcmUsIGFuZCBpZgpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha0dDTWFwLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha0dDTWFwLmgJKHJldmlzaW9uIDIyMjkxMSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtHQ01hcC5oCSh3b3JraW5nIGNv cHkpCkBAIC01OCw2ICs1OCwxMSBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBtX21hcC5zZXQo a2V5LCBXVEZNb3ZlKHZhbHVlKSk7CiAgICAgfQogCisgICAgQWRkUmVzdWx0IGFkZChjb25zdCBL ZXlUeXBlJiBrZXksIFZhbHVlVHlwZSB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiBtX21h cC5hZGQoa2V5LCBXVEZNb3ZlKHZhbHVlKSk7CisgICAgfQorCiAgICAgYm9vbCByZW1vdmUoY29u c3QgS2V5VHlwZSYga2V5KQogICAgIHsKICAgICAgICAgcmV0dXJuIG1fbWFwLnJlbW92ZShrZXkp Owo=