126781 2014-01-10 14:03:34 -0800 reentrant-caching sometimes fails with LLInt disabled 2014-01-15 14:13:49 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 116888 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 966576 0 fpizlo 2014-01-10 14:03:34 -0800 ... 966581 1 fpizlo 2014-01-10 14:07:08 -0800 Here's what it looks like: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x00000001028087e9 lookupExceptionHandler + 25 (Interpreter.h:181) 1 ??? 0x00004b55f6205096 0 + 82832573616278 2 com.apple.JavaScriptCore 0x00000001028bf9ce callToJavaScript + 307 3 com.apple.JavaScriptCore 0x00000001027de693 JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 35 (VM.h:365) 4 com.apple.JavaScriptCore 0x00000001027bac37 JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 439 (Interpreter.cpp:953) 5 com.apple.JavaScriptCore 0x000000010262789e JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 62 (CallData.cpp:39) 6 com.apple.JavaScriptCore 0x00000001027af596 JSC::callGetter(JSC::ExecState*, JSC::JSValue, JSC::JSValue) + 166 (GetterSetter.cpp:62) 7 com.apple.JavaScriptCore 0x000000010260d7a4 JSC::JSValue::get(JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&) const + 516 (JSObject.h:1541) 8 com.apple.JavaScriptCore 0x0000000102802535 operationGetByIdOptimize + 149 (JITOperations.cpp:155) 9 ??? 0x00004b55f6205208 0 + 82832573616648 10 ??? 0x00004b55f6204da5 0 + 82832573615525 11 com.apple.JavaScriptCore 0x00000001028bf9ce callToJavaScript + 307 12 com.apple.JavaScriptCore 0x00000001027de693 JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 35 (VM.h:365) 13 com.apple.JavaScriptCore 0x00000001027bac37 JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 439 (Interpreter.cpp:953) 14 com.apple.JavaScriptCore 0x000000010262789e JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 62 (CallData.cpp:39) 15 com.apple.JavaScriptCore 0x00000001027af596 JSC::callGetter(JSC::ExecState*, JSC::JSValue, JSC::JSValue) + 166 (GetterSetter.cpp:62) 16 com.apple.JavaScriptCore 0x000000010260d7a4 JSC::JSValue::get(JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&) const + 516 (JSObject.h:1541) 17 com.apple.JavaScriptCore 0x0000000102802535 operationGetByIdOptimize + 149 (JITOperations.cpp:155) 18 ??? 0x00004b55f6205208 0 + 82832573616648 19 ??? 0x00004b55f6204da5 0 + 82832573615525 20 com.apple.JavaScriptCore 0x00000001028bf9ce callToJavaScript + 307 21 com.apple.JavaScriptCore 0x00000001027de693 JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 35 (VM.h:365) ... and so on. 968406 2 221285 fpizlo 2014-01-15 11:23:54 -0800 Created attachment 221285 the patch 968414 3 221285 msaboff 2014-01-15 11:42:03 -0800 Comment on attachment 221285 the patch Any particular reason that you make the VM* the first argument to lookupExceptionHandler() ? The pattern is to make the ExecState* the first arg. This simplifies code. r=me 968467 4 fpizlo 2014-01-15 14:13:49 -0800 Landed in http://trac.webkit.org/changeset/162089 221285 2014-01-15 11:23:54 -0800 2014-01-15 11:42:02 -0800 the patch blah.patch text/plain 12133 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYyMDgzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDE0LTAxLTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg cmVlbnRyYW50LWNhY2hpbmcgc29tZXRpbWVzIGZhaWxzIHdpdGggTExJbnQgZGlzYWJsZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjc4MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhl IGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXItPmdlbmVyaWNVbndpbmQtPmhhbmRsZVVuY2F1Z2h0RXhj ZXB0aW9uIHBhdGhzIG5lZWQgdG8KKyAgICAgICAgYmUgcmVzaWxpZW50IGFnYWluc3QgdGhlIGZy YW1lIGZyb20gd2hpY2ggd2UgY2xhaW0gdG8gYmUgdGhyb3dpbmcgdGhlIGV4Y2VwdGlvbgorICAg ICAgICBiZWluZyB0aGUgc2VudGluZWwgZnJhbWUuCisKKyAgICAgICAgKiBkZmcvREZHSklUQ29t cGlsZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkpJVENvbXBpbGVyOjpjb21waWxlRXhjZXB0 aW9uSGFuZGxlcnMpOgorICAgICAgICAqIGZ0bC9GVExDb21waWxlLmNwcDoKKyAgICAgICAgKEpT Qzo6RlRMOjpmaXhGdW5jdGlvbkJhc2VkT25TdGFja01hcHMpOgorICAgICAgICAqIGludGVycHJl dGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OnVud2luZCk6 CisgICAgICAgICogaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuaDoKKyAgICAgICAgKEpTQzo6TmF0 aXZlQ2FsbEZyYW1lVHJhY2VyOjpOYXRpdmVDYWxsRnJhbWVUcmFjZXIpOgorICAgICAgICAqIGpp dC9DQ2FsbEhlbHBlcnMuaDoKKyAgICAgICAgKEpTQzo6Q0NhbGxIZWxwZXJzOjpzZXR1cEFyZ3Vt ZW50cyk6CisgICAgICAgICogaml0L0pJVC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6cHJpdmF0 ZUNvbXBpbGVFeGNlcHRpb25IYW5kbGVycyk6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMu Y3BwOgorICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmg6CisgICAgICAgICogaml0L1JlcGF0 Y2guY3BwOgorICAgICAgICAoSlNDOjp0cnlCdWlsZEdldEJ5SURMaXN0KToKKyAgICAgICAgKiBq aXQvVGh1bmtHZW5lcmF0b3JzLmNwcDoKKyAgICAgICAgKEpTQzo6dGhyb3dFeGNlcHRpb25Gcm9t Q2FsbFNsb3dQYXRoR2VuZXJhdG9yKToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJl dGVyNjQuYXNtOgorCiAyMDE0LTAxLTE0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgRlRMIHNsb3cgcGF0aCBjYWxscyBpbiBpbmxpbmUgY2FjaGVzIHNob3VsZCBi ZSBkb3duIHdpdGggZXhjZXB0aW9ucwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdKSVRDb21waWxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdKSVRDb21waWxlci5jcHAJKHJldmlzaW9uIDE2MjA0MykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsMjIg KzEyMSwyNSBAQCB2b2lkIEpJVENvbXBpbGVyOjpjb21waWxlRXhjZXB0aW9uSGFuZGxlCiAKICAg ICBpZiAoIW1fZXhjZXB0aW9uQ2hlY2tzV2l0aENhbGxGcmFtZVJvbGxiYWNrLmVtcHR5KCkpIHsK ICAgICAgICAgbV9leGNlcHRpb25DaGVja3NXaXRoQ2FsbEZyYW1lUm9sbGJhY2subGluayh0aGlz KTsKLSAgICAgICAgZW1pdEdldENhbGxlckZyYW1lRnJvbUNhbGxGcmFtZUhlYWRlclB0cihHUFJJ bmZvOjphcmd1bWVudEdQUjApOworICAgICAgICBlbWl0R2V0Q2FsbGVyRnJhbWVGcm9tQ2FsbEZy YW1lSGVhZGVyUHRyKEdQUkluZm86OmFyZ3VtZW50R1BSMSk7CiAgICAgICAgIGRvTG9va3VwID0g anVtcCgpOwogICAgIH0KIAogICAgIGlmICghbV9leGNlcHRpb25DaGVja3MuZW1wdHkoKSkKICAg ICAgICAgbV9leGNlcHRpb25DaGVja3MubGluayh0aGlzKTsKIAotICAgIC8vIGxvb2t1cEV4Y2Vw dGlvbkhhbmRsZXIgaXMgcGFzc2VkIG9uZSBhcmd1bWVudCwgdGhlIGV4ZWMgKHRoZSBDYWxsRnJh bWUqKS4KLSAgICBtb3ZlKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1 bWVudEdQUjApOworICAgIC8vIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIgaXMgcGFzc2VkIHR3byBh cmd1bWVudHMsIHRoZSBWTSBhbmQgdGhlIGV4ZWMgKHRoZSBDYWxsRnJhbWUqKS4KKyAgICBtb3Zl KEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVudEdQUjEpOwogCiAg ICAgaWYgKGRvTG9va3VwLmlzU2V0KCkpCiAgICAgICAgIGRvTG9va3VwLmxpbmsodGhpcyk7CiAK KyAgICBtb3ZlKFRydXN0ZWRJbW1QdHIodm0oKSksIEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CisK ICNpZiBDUFUoWDg2KQogICAgIC8vIEZJWE1FOiBzaG91bGQgdXNlIHRoZSBjYWxsIGFic3RyYWN0 aW9uLCBidXQgdGhpcyBpcyBjdXJyZW50bHkgaW4gdGhlIFNwZWN1bGF0aXZlSklUIGxheWVyIQog ICAgIHBva2UoR1BSSW5mbzo6YXJndW1lbnRHUFIwKTsKKyAgICBwb2tlKEdQUkluZm86OmFyZ3Vt ZW50R1BSMSwgMSk7CiAjZW5kaWYKICAgICBtX2NhbGxzLmFwcGVuZChDYWxsTGlua1JlY29yZChj YWxsKCksIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIpKTsKICAgICBqdW1wVG9FeGNlcHRpb25IYW5k bGVyKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENvbXBpbGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQ29tcGlsZS5jcHAJKHJl dmlzaW9uIDE2MjA0NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQ29tcGlsZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE3OSw3ICsxNzksOCBAQCBzdGF0aWMgdm9pZCBmaXhGdW5j dGlvbkJhc2VkT25TdGFja01hcHMoCiAgICAgICAgIGNoZWNrSklULm1vdmUoTWFjcm9Bc3NlbWJs ZXI6OlRydXN0ZWRJbW02NChUYWdUeXBlTnVtYmVyKSwgR1BSSW5mbzo6dGFnVHlwZU51bWJlclJl Z2lzdGVyKTsKICAgICAgICAgY2hlY2tKSVQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZElt bTY0KFRhZ01hc2spLCBHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIpOwogICAgICAgICAKLSAgICAg ICAgY2hlY2tKSVQubW92ZShHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6YXJn dW1lbnRHUFIwKTsKKyAgICAgICAgY2hlY2tKSVQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3Rl ZEltbVB0cigmdm0pLCBHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgICAgICBjaGVja0pJVC5t b3ZlKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVudEdQUjEpOwog ICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsID0gY2hlY2tKSVQuY2FsbCgpOwogICAg ICAgICBjaGVja0pJVC5qdW1wVG9FeGNlcHRpb25IYW5kbGVyKCk7CiAgICAgICAgIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3Bw CShyZXZpc2lvbiAxNjIwNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIv SW50ZXJwcmV0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NDksNiArNjQ5LDE1IEBAIHByaXZh dGU6CiAKIE5FVkVSX0lOTElORSBIYW5kbGVySW5mbyogSW50ZXJwcmV0ZXI6OnVud2luZChDYWxs RnJhbWUqJiBjYWxsRnJhbWUsIEpTVmFsdWUmIGV4Y2VwdGlvblZhbHVlKQogeworICAgIGlmIChj YWxsRnJhbWUtPmlzVk1FbnRyeVNlbnRpbmVsKCkpIHsKKyAgICAgICAgLy8gVGhpcyBoYXBwZW5z IHdoZW4gd2UgdGhyb3cgc3RhY2sgb3ZlcmZsb3cgaW4gYSBmdW5jdGlvbiB0aGF0IGlzIGNhbGxl ZAorICAgICAgICAvLyBkaXJlY3RseSBmcm9tIGNhbGxUb0phdmFTY3JpcHQuICBTdGFjayBvdmVy ZmxvdyB0aHJvd3MgdGhlIGV4Y2VwdGlvbiBpbiB0aGUKKyAgICAgICAgLy8gY29udGV4dCBvZiB0 aGUgY2FsbGVyLiAgSW4gdGhhdCBjYXNlIHRoZSBjYWxsZXIgaXMgdGhlIHNlbnRpbmVsIGZyYW1l LiAgVGhlCisgICAgICAgIC8vIHJpZ2h0IHRoaW5nIHRvIGRvIGlzIHRvIHByZXRlbmQgdGhhdCB0 aGUgZXhjZXB0aW9uIGlzIHVuY2F1Z2h0IHNvIHRoYXQgd2UKKyAgICAgICAgLy8gZ28gdG8gdGhl IHVuY2F1Z2h0IGV4Y2VwdGlvbiBoYW5kbGVyLCB3aGljaCByZXR1cm5zIHRocm91Z2ggY2FsbFRv SmF2YVNjcmlwdC4KKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorICAgIAogICAgIENvZGVCbG9j ayogY29kZUJsb2NrID0gY2FsbEZyYW1lLT5jb2RlQmxvY2soKTsKICAgICBib29sIGlzVGVybWlu YXRpb24gPSBmYWxzZTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVy L0ludGVycHJldGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVy cHJldGVyL0ludGVycHJldGVyLmgJKHJldmlzaW9uIDE2MjA0MykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODAs NiArMTgwLDE1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgQVNTRVJUKCFjYWxsRnJh bWUtPmlzVk1FbnRyeVNlbnRpbmVsKCkpOwogICAgICAgICAgICAgdm0tPnRvcENhbGxGcmFtZSA9 IGNhbGxGcmFtZTsKICAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgZW51bSBWTUVudHJ5U2Vu dGluZWxPS1RhZyB7IFZNRW50cnlTZW50aW5lbE9LIH07CisgICAgICAgIEFMV0FZU19JTkxJTkUg TmF0aXZlQ2FsbEZyYW1lVHJhY2VyKFZNKiB2bSwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIFZNRW50 cnlTZW50aW5lbE9LVGFnKQorICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlQodm0pOworICAg ICAgICAgICAgQVNTRVJUKGNhbGxGcmFtZSk7CisgICAgICAgICAgICBpZiAoIWNhbGxGcmFtZS0+ aXNWTUVudHJ5U2VudGluZWwoKSkKKyAgICAgICAgICAgICAgICB2bS0+dG9wQ2FsbEZyYW1lID0g Y2FsbEZyYW1lOworICAgICAgICB9CiAgICAgfTsKIAogICAgIGNsYXNzIEludGVycHJldGVyIHsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkocmV2aXNpb24g MTYyMDQzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkod29y a2luZyBjb3B5KQpAQCAtOTUsNiArOTUsMTMgQEAgcHVibGljOgogICAgICAgICBhZGRDYWxsQXJn dW1lbnQoYXJnMik7CiAgICAgfQogICAgIAorICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzZXR1cEFy Z3VtZW50cyhUcnVzdGVkSW1tUHRyIGFyZzEsIEdQUlJlZyBhcmcyKQorICAgIHsKKyAgICAgICAg cmVzZXRDYWxsQXJndW1lbnRzKCk7CisgICAgICAgIGFkZENhbGxBcmd1bWVudChhcmcxKTsKKyAg ICAgICAgYWRkQ2FsbEFyZ3VtZW50KGFyZzIpOworICAgIH0KKyAgICAKICAgICBBTFdBWVNfSU5M SU5FIHZvaWQgc2V0dXBBcmd1bWVudHMoR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcyLCBHUFJSZWcg YXJnMykKICAgICB7CiAgICAgICAgIHJlc2V0Q2FsbEFyZ3VtZW50cygpOwpAQCAtOTM5LDYgKzk0 NiwxMiBAQCBwdWJsaWM6CiAgICAgICAgIG1vdmUoYXJnMSwgR1BSSW5mbzo6YXJndW1lbnRHUFIw KTsKICAgICB9CiAKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0dXBBcmd1bWVudHMoVHJ1c3Rl ZEltbVB0ciBhcmcxLCBHUFJSZWcgYXJnMikKKyAgICB7CisgICAgICAgIG1vdmUoYXJnMiwgR1BS SW5mbzo6YXJndW1lbnRHUFIxKTsKKyAgICAgICAgbW92ZShhcmcxLCBHUFJJbmZvOjphcmd1bWVu dEdQUjApOworICAgIH0KKyAgICAKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0dXBBcmd1bWVu dHMoR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcyKQogICAgIHsKICAgICAgICAgc2V0dXBUd29TdHVi QXJnc0dQUjxHUFJJbmZvOjphcmd1bWVudEdQUjAsIEdQUkluZm86OmFyZ3VtZW50R1BSMT4oYXJn MSwgYXJnMik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCShyZXZpc2lvbiAxNjIw NDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTcwMiw3ICs3MDIsNyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVFeGNlcHRpb25IYW5k bGVyCiAKICAgICBpZiAoIW1fZXhjZXB0aW9uQ2hlY2tzV2l0aENhbGxGcmFtZVJvbGxiYWNrLmVt cHR5KCkpIHsKICAgICAgICAgbV9leGNlcHRpb25DaGVja3NXaXRoQ2FsbEZyYW1lUm9sbGJhY2su bGluayh0aGlzKTsKLSAgICAgICAgZW1pdEdldENhbGxlckZyYW1lRnJvbUNhbGxGcmFtZUhlYWRl clB0cihHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgICAgICBlbWl0R2V0Q2FsbGVyRnJhbWVG cm9tQ2FsbEZyYW1lSGVhZGVyUHRyKEdQUkluZm86OmFyZ3VtZW50R1BSMSk7CiAgICAgICAgIGRv TG9va3VwID0ganVtcCgpOwogICAgIH0KIApAQCAtNzEwLDE0ICs3MTAsMTcgQEAgdm9pZCBKSVQ6 OnByaXZhdGVDb21waWxlRXhjZXB0aW9uSGFuZGxlcgogICAgICAgICBtX2V4Y2VwdGlvbkNoZWNr cy5saW5rKHRoaXMpOwogICAgIAogICAgIC8vIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIgaXMgcGFz c2VkIG9uZSBhcmd1bWVudCwgdGhlIGV4ZWMgKHRoZSBDYWxsRnJhbWUqKS4KLSAgICBtb3ZlKEdQ UkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgIG1v dmUoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEdQUkluZm86OmFyZ3VtZW50R1BSMSk7CiAK ICAgICBpZiAoZG9Mb29rdXAuaXNTZXQoKSkKICAgICAgICAgZG9Mb29rdXAubGluayh0aGlzKTsK IAorICAgIG1vdmUoVHJ1c3RlZEltbVB0cih2bSgpKSwgR1BSSW5mbzo6YXJndW1lbnRHUFIwKTsK KwogI2lmIENQVShYODYpCiAgICAgLy8gRklYTUU6IHNob3VsZCB1c2UgdGhlIGNhbGwgYWJzdHJh Y3Rpb24sIGJ1dCB0aGlzIGlzIGN1cnJlbnRseSBpbiB0aGUgU3BlY3VsYXRpdmVKSVQgbGF5ZXIh CiAgICAgcG9rZShHUFJJbmZvOjphcmd1bWVudEdQUjApOworICAgIHBva2UoR1BSSW5mbzo6YXJn dW1lbnRHUFIxLCAxKTsKICNlbmRpZgogICAgIG1fY2FsbHMuYXBwZW5kKENhbGxSZWNvcmQoY2Fs bCgpLCAodW5zaWduZWQpLTEsIEZ1bmN0aW9uUHRyKGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIpLnZh bHVlKCkpKTsKICAgICBqdW1wVG9FeGNlcHRpb25IYW5kbGVyKCk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDE2MjA0MykKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3MzEsMTIgKzE3MzEsMTEgQEAgdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblRo cm93KEV4ZWNTdAogICAgIGdlbmVyaWNVbndpbmQodm0sIGV4ZWMsIGV4Y2VwdGlvblZhbHVlKTsK IH0KIAotdm9pZCBKSVRfT1BFUkFUSU9OIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIoRXhlY1N0YXRl KiBleGVjKQordm9pZCBKSVRfT1BFUkFUSU9OIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIoVk0qIHZt LCBFeGVjU3RhdGUqIGV4ZWMpCiB7Ci0gICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7Ci0gICAgTmF0 aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcih2bSwgZXhlYyk7CisgICAgTmF0aXZlQ2FsbEZyYW1l VHJhY2VyIHRyYWNlcih2bSwgZXhlYywgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyOjpWTUVudHJ5U2Vu dGluZWxPSyk7CiAKLSAgICBKU1ZhbHVlIGV4Y2VwdGlvblZhbHVlID0gZXhlYy0+ZXhjZXB0aW9u KCk7CisgICAgSlNWYWx1ZSBleGNlcHRpb25WYWx1ZSA9IHZtLT5leGNlcHRpb24oKTsKICAgICBB U1NFUlQoZXhjZXB0aW9uVmFsdWUpOwogICAgIAogICAgIGdlbmVyaWNVbndpbmQodm0sIGV4ZWMs IGV4Y2VwdGlvblZhbHVlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bl cmF0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bl cmF0aW9ucy5oCShyZXZpc2lvbiAxNjIwNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVE9wZXJhdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTgzLDggKzE4Myw4IEBAIHR5cGVk ZWYgSlNTdHJpbmcqIEpJVF9PUEVSQVRJT04gKCpKc3NfSkkKIAogLy8gVGhpcyBtZXRob2QgaXMg dXNlZCB0byBsb29rdXAgYW4gZXhjZXB0aW9uIGhhbmRlciwga2V5ZWQgYnkgZmF1bHRMb2NhdGlv biwgd2hpY2ggaXMKIC8vIHRoZSByZXR1cm4gbG9jYXRpb24gZnJvbSBvbmUgb2YgdGhlIGNhbGxz IG91dCB0byBvbmUgb2YgdGhlIGhlbHBlciBvcGVyYXRpb25zIGFib3ZlLgotICAgIAotdm9pZCBK SVRfT1BFUkFUSU9OIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIoRXhlY1N0YXRlKikgV1RGX0lOVEVS TkFMOworCit2b2lkIEpJVF9PUEVSQVRJT04gbG9va3VwRXhjZXB0aW9uSGFuZGxlcihWTSosIEV4 ZWNTdGF0ZSopIFdURl9JTlRFUk5BTDsKIHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25WTUhh bmRsZUV4Y2VwdGlvbihFeGVjU3RhdGUqKSBXVEZfSU5URVJOQUw7CiAKIHZvaWQgSklUX09QRVJB VElPTiBvcGVyYXRpb25UaHJvd1N0YWNrT3ZlcmZsb3dFcnJvcihFeGVjU3RhdGUqLCBDb2RlQmxv Y2sqKSBXVEZfSU5URVJOQUw7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0 Y2guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5j cHAJKHJldmlzaW9uIDE2MjA0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRj aC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU1OSw3ICs1NTksNyBAQCBzdGF0aWMgYm9vbCB0cnlC dWlsZEdldEJ5SURMaXN0KEV4ZWNTdGF0CiAjZW5kaWYKICAgICAgICAgICAgIHN1Y2Nlc3MgPSBz dHViSml0LmVtaXRFeGNlcHRpb25DaGVjayhDQ2FsbEhlbHBlcnM6OkludmVydGVkRXhjZXB0aW9u Q2hlY2spOwogICAgICAgICAgICAgCi0gICAgICAgICAgICBzdHViSml0LnNldHVwQXJndW1lbnRz RXhlY1N0YXRlKCk7CisgICAgICAgICAgICBzdHViSml0LnNldHVwQXJndW1lbnRzKENDYWxsSGVs cGVyczo6VHJ1c3RlZEltbVB0cih2bSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyKTsKICAg ICAgICAgICAgIGhhbmRsZXJDYWxsID0gc3R1YkppdC5jYWxsKCk7CiAgICAgICAgICAgICBzdHVi Sml0Lmp1bXBUb0V4Y2VwdGlvbkhhbmRsZXIoKTsKICAgICAgICAgfSBlbHNlIHsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAJKHJldmlzaW9u IDE2MjA0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjYsNyArNjYsNyBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWYg dGhyb3dFeGNlcHRpb25Gcm9tCiAgICAgLy8gZXZlbiB0aG91Z2ggd2Ugd29uJ3QgdXNlIGl0Lgog ICAgIGppdC5wcmVzZXJ2ZVJldHVybkFkZHJlc3NBZnRlckNhbGwoR1BSSW5mbzo6bm9uUHJlc2Vy dmVkTm9uUmV0dXJuR1BSKTsKIAotICAgIGppdC5zZXR1cEFyZ3VtZW50c0V4ZWNTdGF0ZSgpOwor ICAgIGppdC5zZXR1cEFyZ3VtZW50cyhDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIodm0pLCBH UFJJbmZvOjpjYWxsRnJhbWVSZWdpc3Rlcik7CiAgICAgaml0Lm1vdmUoQ0NhbGxIZWxwZXJzOjpU cnVzdGVkSW1tUHRyKGJpdHdpc2VfY2FzdDx2b2lkKj4obG9va3VwRXhjZXB0aW9uSGFuZGxlcikp LCBHUFJJbmZvOjpub25BcmdHUFIwKTsKICAgICBlbWl0UG9pbnRlclZhbGlkYXRpb24oaml0LCBH UFJJbmZvOjpub25BcmdHUFIwKTsKICAgICBqaXQuY2FsbChHUFJJbmZvOjpub25BcmdHUFIwKTsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQu YXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbElu dGVycHJldGVyNjQuYXNtCShyZXZpc2lvbiAxNjIwNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMjY3 LDEwICsyNjcsMTMgQEAgX2hhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uOgogICAgIGxvYWRwIE1hcmtl ZEJsb2NrOjptX3dlYWtTZXQgKyBXZWFrU2V0OjptX3ZtW3QzXSwgdDMKICAgICBsb2FkcCBWTTo6 Y2FsbEZyYW1lRm9yVGhyb3dbdDNdLCBjZnIKIAotICAgICMgU28gZmFyLCB3ZSd2ZSB1bndvdW5k IHRoZSBzdGFjayB0byB0aGUgZnJhbWUganVzdCBiZWxvdyB0aGUgc2VudGluZWwgZnJhbWUuCi0g ICAgIyBXZSBuZWVkIHRvIHBvcCB0byB0aGUgc2VudGluZWwgZnJhbWUgYW5kIGRvIHRoZSBuZWNl c3NhcnkgY2xlYW4gdXAgZm9yCisgICAgIyBTbyBmYXIsIHdlJ3ZlIHVud291bmQgdGhlIHN0YWNr IHRvIHRoZSBmcmFtZSBqdXN0IGJlbG93IHRoZSBzZW50aW5lbCBmcmFtZSwgZXhjZXB0CisgICAg IyBpbiB0aGUgY2FzZSBvZiBzdGFjayBvdmVyZmxvdyBpbiB0aGUgZmlyc3QgZnVuY3Rpb24gY2Fs bGVkIGZyb20gY2FsbFRvSmF2YVNjcmlwdC4KKyAgICAjIENoZWNrIGlmIHdlIG5lZWQgdG8gcG9w IHRvIHRoZSBzZW50aW5lbCBmcmFtZSBhbmQgZG8gdGhlIG5lY2Vzc2FyeSBjbGVhbiB1cCBmb3IK ICAgICAjIHJldHVybmluZyB0byB0aGUgY2FsbGVyIEMgZnJhbWUuCisgICAgYnBlcSBDb2RlQmxv Y2tbY2ZyXSwgMSwgLmhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uQWxyZWFkeUlzU2VudGluZWwKICAg ICBsb2FkcCBDYWxsZXJGcmFtZVtjZnJdLCBjZnIKKy5oYW5kbGVVbmNhdWdodEV4Y2VwdGlvbkFs cmVhZHlJc1NlbnRpbmVsOgogCiAgICAgbG9hZHAgQ2FsbGVlW2Nmcl0sIHQzICMgVk0KICAgICBs b2FkcCBTY29wZUNoYWluW2Nmcl0sIHQ1ICMgcHJldmlvdXMgdG9wQ2FsbEZyYW1lCg==