151892 2015-12-04 16:20:57 -0800 CRASH: CodeBlock::setOptimizationThresholdBasedOnCompilationResult + 567 2015-12-07 16:35:40 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 151893 1 msaboff msaboff commit-queue ggaren joepeck keith_miller mark.lam saam oldest_to_newest 1146470 0 msaboff 2015-12-04 16:20:57 -0800 Backtrace like: 1 com.apple.JavaScriptCore 0x113ea02ce WTFCrash + 0x3e (Assertions.cpp:321) > 2 com.apple.JavaScriptCore 0x1138acbb7 JSC::CodeBlock::setOptimizationThresholdBasedOnCompilationResult(JSC::CompilationResult) + 0x237 (DataLog.h:45) 3 com.apple.JavaScriptCore 0x113c16e4c JSC::JITToDFGDeferredCompilationCallback::compilationDidComplete(JSC::CodeBlock*, JSC::CompilationResult) + 0x8c (JITToDFGDeferredCompilationCallback.cpp:69) 4 com.apple.JavaScriptCore 0x113aac7d4 JSC::DFG::Worklist::completeAllReadyPlansForVM(JSC::VM&, JSC::DFG::CompilationKey) + 0x104 (DFGCompilationKey.h:74) 5 com.apple.JavaScriptCore 0x113aaca0e JSC::DFG::Worklist::completeAllPlansForVM(JSC::VM&) + 0x3e (HeapInlines.h:308) 6 com.apple.JavaScriptCore 0x113aadde8 JSC::DFG::completeAllPlansForVM(JSC::VM&) + 0x38 (DFGWorklist.cpp:453) 7 com.apple.JavaScriptCore 0x1138ea488 JSC::Debugger::exception(JSC::ExecState*, JSC::JSValue, bool) + 0x68 (JSCInlines.h:66) 8 com.apple.JavaScriptCore 0x113bc0cb5 JSC::Interpreter::unwind(void*&, JSC::ExecState*&, JSC::Exception*) + 0x155 (Interpreter.cpp:691) 9 com.apple.JavaScriptCore 0x113bde07a JSC::genericUnwind(JSC::VM*, JSC::ExecState*) + 0x5a (JITExceptions.cpp:57) 10 0x00004e6b5a801060 0 + 86222986809440 11 com.apple.JavaScriptCore 0x113d1ef10 llint_entry + 0x58c7 12 com.apple.JavaScriptCore 0x113d1ef10 llint_entry + 0x58c7 13 com.apple.JavaScriptCore 0x113d19439 vmEntryToJavaScript + 0x146 14 com.apple.JavaScriptCore 0x113bdc7d9 JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 0xa9 (JITCode.cpp:82) 15 com.apple.JavaScriptCore 0x113bc397a JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 0x1ba (Interpreter.cpp:946) 16 com.apple.JavaScriptCore 0x1138947a7 JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&, WTF::NakedPtr<JSC::Exception>&) + 0x47 (MarkedBlock.h:250) 17 com.apple.WebCore 0x114a31dda WebCore::JSEventListener::handleEvent(WebCore::ScriptExecutionContext*, WebCore::Event*) + 0x3ea (JSMainThreadExecState.h:56) 18 com.apple.WebCore 0x11467607b WebCore::EventTarget::fireEventListeners(WebCore::Event*, WebCore::EventTargetData*, WTF::Vector<WebCore::RegisteredEventListener, 1ul, WTF::CrashOnOverflow, 16ul>&) + 0x27b (InspectorInstrumentation.h:283) 19 com.apple.WebCore 0x114675d40 WebCore::EventTarget::fireEventListeners(WebCore::Event*) + 0xe0 (EventTarget.cpp:208) 20 com.apple.WebCore 0x114675c3d WebCore::EventTarget::dispatchEvent(WTF::PassRefPtr<WebCore::Event>) + 0x5d (PassRefPtr.h:68) ... 1146475 1 266679 msaboff 2015-12-04 16:28:46 -0800 Created attachment 266679 Patch 1146478 2 266679 mark.lam 2015-12-04 16:37:00 -0800 Comment on attachment 266679 Patch r=me 1146486 3 266682 msaboff 2015-12-04 16:50:00 -0800 Created attachment 266682 Patch for Landing Changed the order of the "if" predicates to make it a little more defensive. That is don't check the replacement CodeBlock until first checking that the compilation was successful. 1146489 4 msaboff 2015-12-04 16:53:36 -0800 I'll land without the change for https://bugs.webkit.org/show_bug.cgi?id=151893 that was inadvertently added in the last patch. 1146497 5 266682 joepeck 2015-12-04 17:01:39 -0800 Comment on attachment 266682 Patch for Landing Err back to r?. I am fine with the inspector test. A JSC reviewer should review the CodeBlock changes! 1146498 6 joepeck 2015-12-04 17:02:32 -0800 Oh, I think I accidentally stomped Mark Lam's r+ on this! 1146499 7 266682 joepeck 2015-12-04 17:02:50 -0800 Comment on attachment 266682 Patch for Landing Restoring Mark Lam's r+ 1146502 8 msaboff 2015-12-04 17:04:33 -0800 Committed r193491: <http://trac.webkit.org/changeset/193491> 1146695 9 ggaren 2015-12-06 13:12:20 -0800 I don't love this fix. A lot of things can go wrong if we throw away code while compiling. I think it would be better to wait for all compilation to terminate. I thought that's how things already worked. 1146890 10 msaboff 2015-12-07 10:09:19 -0800 (In reply to comment #9) > I don't love this fix. A lot of things can go wrong if we throw away code > while compiling. I think it would be better to wait for all compilation to > terminate. I thought that's how things already worked. I don't understand your concern. We are in the process of waiting for all compilations to complete as per the backtrace frame 6. In this case, we aren't throwing away any code, just not updating the optimization threshold. 1147025 11 msaboff 2015-12-07 14:47:18 -0800 After discussing with Geoff, going to take a less confusion approach to fixing this problem. 1147049 12 266821 msaboff 2015-12-07 15:40:08 -0800 Created attachment 266821 Updated patch for landing 1147102 13 msaboff 2015-12-07 16:32:06 -0800 Committed r193674: <http://trac.webkit.org/changeset/193674> 1147104 14 msaboff 2015-12-07 16:35:40 -0800 *** Bug 131771 has been marked as a duplicate of this bug. *** 266679 2015-12-04 16:28:46 -0800 2015-12-04 16:50:00 -0800 Patch 151892.patch text/plain 1963 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNDg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE1LTEyLTA0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENSQVNIOiBDb2RlQmxvY2s6OnNldE9wdGltaXphdGlvblRocmVzaG9sZEJhc2VkT25Db21w aWxhdGlvblJlc3VsdCArIDU2NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUxODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2hlbiB0aGUgZGVidWdnZXIgaXMgaW4gdGhlIHByb2Nlc3Mgb2YgYXR0YWNo aW5nIGFuZCBpdCByZWNvbXBpbGVzIGZ1bmN0aW9ucworICAgICAgICBmb3IgZGVidWdnaW5nLCB0 aGVyZSBjYW4gYWxzbyBiZSBhIERGRyBjb21waWxhdGlvbiBydW5uaW5nIGNvbmN1cnJlbnRseS4K KyAgICAgICAgV2hlbiB3ZSBnbyB0byB1cGRhdGUgdGhlIG9wdGltaXphdGlvbiB0aHJlc2hvbGQg YW5kIGZpbmQgdGhhdCB0aGUgcmVwbGFjZW1lbnQKKyAgICAgICAgaXMgYWxzbyBiYXNlbGluZSBj b2RlLCB3ZSBzaG91bGRuJ3QgdXBkYXRlIHRoZSB0aHJlc2hvbGQuCisKKyAgICAgICAgKiBieXRl Y29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OnNldE9wdGltaXph dGlvblRocmVzaG9sZEJhc2VkT25Db21waWxhdGlvblJlc3VsdCk6CisKIDIwMTUtMTItMDQgIFNh YW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgT1NSIGV4aXRzIHRoYXQg YXJlIGV4Y2VwdGlvbiBoYW5kbGVycyBzaG91bGQgZW1pdCBsZXNzIGNvZGUgZWFnZXJseSBpbiB0 aGUgdGh1bmsgZ2VuZXJhdG9yLCBhbmQgaW5zdGVhZCwgc2hvdWxkIGRlZmVyIGFzIG11Y2ggY29k ZSBnZW5lcmF0aW9uIGFzIHBvc3NpYmxlIHRvIGJlIGxhemlseSBnZW5lcmF0ZWQgaW4gdGhlIGV4 aXQgaXRzZWxmCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2Nr LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJs b2NrLmNwcAkocmV2aXNpb24gMTkzNDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3MDUsNiArMzcwNSwxMiBAQCB2 b2lkIENvZGVCbG9jazo6c2V0T3B0aW1pemF0aW9uVGhyZXNob2xkCiAgICAgfQogICAgIAogICAg IENvZGVCbG9jayogdGhlUmVwbGFjZW1lbnQgPSByZXBsYWNlbWVudCgpOworCisgICAgLy8gSWYg b3VyIHJlcGxhY2VtZW50IGlzIGJhc2VsaW5lIGNvZGUsIHRoZSBkZWJ1Z2dlciBoYXMgcHJvYmFi bHkgYXR0YWNoZWQgYW5kIHJlY29tcGlsZWQgdGhlIGZ1bmN0aW9uLgorICAgIC8vIE5vIHRocmVz aG9sZCB0byBjaGFuZ2UuCisgICAgaWYgKCh0aGVSZXBsYWNlbWVudC0+aml0VHlwZSgpID09IEpJ VENvZGU6OkJhc2VsaW5lSklUKSAmJiAocmVzdWx0ID09IENvbXBpbGF0aW9uU3VjY2Vzc2Z1bCkp CisgICAgICAgIHJldHVybjsKKwogICAgIGlmICgocmVzdWx0ID09IENvbXBpbGF0aW9uU3VjY2Vz c2Z1bCkgIT0gKHRoZVJlcGxhY2VtZW50ICE9IHRoaXMpKSB7CiAgICAgICAgIGRhdGFMb2coKnRo aXMsICI6IHdlIGhhdmUgcmVzdWx0ID0gIiwgcmVzdWx0LCAiIGJ1dCAiKTsKICAgICAgICAgaWYg KHRoZVJlcGxhY2VtZW50ID09IHRoaXMpCg== 266682 2015-12-04 16:50:00 -0800 2015-12-07 15:40:08 -0800 Patch for Landing 151892-2.patch text/plain 6046 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNDg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE1LTEyLTA0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENSQVNIOiBDb2RlQmxvY2s6OnNldE9wdGltaXphdGlvblRocmVzaG9sZEJhc2VkT25Db21w aWxhdGlvblJlc3VsdCArIDU2NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUxODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAg ICAgICAgV2hlbiB0aGUgZGVidWdnZXIgaXMgaW4gdGhlIHByb2Nlc3Mgb2YgYXR0YWNoaW5nIGFu ZCBpdCByZWNvbXBpbGVzIGZ1bmN0aW9ucworICAgICAgICBmb3IgZGVidWdnaW5nLCB0aGVyZSBj YW4gYWxzbyBiZSBhIERGRyBjb21waWxhdGlvbiBydW5uaW5nIGNvbmN1cnJlbnRseS4KKyAgICAg ICAgV2hlbiB3ZSBnbyB0byB1cGRhdGUgdGhlIG9wdGltaXphdGlvbiB0aHJlc2hvbGQgYW5kIGZp bmQgdGhhdCB0aGUgcmVwbGFjZW1lbnQKKyAgICAgICAgaXMgYWxzbyBiYXNlbGluZSBjb2RlLCB3 ZSBzaG91bGRuJ3QgdXBkYXRlIHRoZSB0aHJlc2hvbGQuCisKKyAgICAgICAgKiBieXRlY29kZS9D b2RlQmxvY2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OnNldE9wdGltaXphdGlvblRo cmVzaG9sZEJhc2VkT25Db21waWxhdGlvblJlc3VsdCk6CisKIDIwMTUtMTItMDQgIFNhYW0gYmFy YXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgT1NSIGV4aXRzIHRoYXQgYXJlIGV4 Y2VwdGlvbiBoYW5kbGVycyBzaG91bGQgZW1pdCBsZXNzIGNvZGUgZWFnZXJseSBpbiB0aGUgdGh1 bmsgZ2VuZXJhdG9yLCBhbmQgaW5zdGVhZCwgc2hvdWxkIGRlZmVyIGFzIG11Y2ggY29kZSBnZW5l cmF0aW9uIGFzIHBvc3NpYmxlIHRvIGJlIGxhemlseSBnZW5lcmF0ZWQgaW4gdGhlIGV4aXQgaXRz ZWxmCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNw cAkocmV2aXNpb24gMTkzNDM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3MDUsNiArMzcwNSwxMiBAQCB2b2lkIENv ZGVCbG9jazo6c2V0T3B0aW1pemF0aW9uVGhyZXNob2xkCiAgICAgfQogICAgIAogICAgIENvZGVC bG9jayogdGhlUmVwbGFjZW1lbnQgPSByZXBsYWNlbWVudCgpOworCisgICAgLy8gSWYgb3VyIHJl cGxhY2VtZW50IGlzIGJhc2VsaW5lIGNvZGUsIHRoZSBkZWJ1Z2dlciBoYXMgcHJvYmFibHkgYXR0 YWNoZWQgYW5kIHJlY29tcGlsZWQgdGhlIGZ1bmN0aW9uLgorICAgIC8vIE5vIHRocmVzaG9sZCB0 byBjaGFuZ2UuCisgICAgaWYgKChyZXN1bHQgPT0gQ29tcGlsYXRpb25TdWNjZXNzZnVsKSAmJiAo dGhlUmVwbGFjZW1lbnQtPmppdFR5cGUoKSA9PSBKSVRDb2RlOjpCYXNlbGluZUpJVCkpCisgICAg ICAgIHJldHVybjsKKwogICAgIGlmICgocmVzdWx0ID09IENvbXBpbGF0aW9uU3VjY2Vzc2Z1bCkg IT0gKHRoZVJlcGxhY2VtZW50ICE9IHRoaXMpKSB7CiAgICAgICAgIGRhdGFMb2coKnRoaXMsICI6 IHdlIGhhdmUgcmVzdWx0ID0gIiwgcmVzdWx0LCAiIGJ1dCAiKTsKICAgICAgICAgaWYgKHRoZVJl cGxhY2VtZW50ID09IHRoaXMpCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTM0ODYpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxNS0xMi0w NCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KKworICAgICAgICBSZS1lbmFi bGUgaW5zcGVjdG9yL2RlYnVnZ2VyL3BhdXNlLXJlYXNvbiBhZnRlciBmaXhpbmcgMTUxODkyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE4OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBmaXhp bmcgdGhlIHJlYXNvbiBmb3IgdGhlIGNyYXNoIGluIHd3dy53ZWJraXQub3JnL2IvMTUxODkyCisg ICAgICAgIGFuZCB1cGRhdGluZyB0aGUgdGVzdCBmb3IgYSB0aW1pbmcgaXNzdWUsIHdlIGNhbiBy ZS1lbmFibGUgaXQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvcGF1c2UtcmVhc29u Lmh0bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTUt MTItMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vZGVy biBJREI6IHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci11cGRhdGUuaHRtbCBmYWlscy4KSW5kZXg6 IExheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZS1yZWFzb24uaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcGF1c2UtcmVhc29uLmh0bWwJ KHJldmlzaW9uIDE5MzQzNCkKKysrIExheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVz ZS1yZWFzb24uaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTIsMTEgKzEyLDExIEBAIGZ1bmN0aW9u IHRlc3QoKQogICAgIHZhciBwYXVzZXMgPSAwOwogICAgIHZhciBpbmRleCA9IDA7CiAgICAgdmFy IHRlc3RDYXNlcyA9IFsKLSAgICAgICAgeyBleHByZXNzaW9uOiAic2V0VGltZW91dCh0cmlnZ2Vy RXhjZXB0aW9uLCAwKSIgfSwKLSAgICAgICAgeyBleHByZXNzaW9uOiAic2V0VGltZW91dCh0cmln Z2VyRGVidWdnZXJTdGF0ZW1lbnQsIDApIiB9LAotICAgICAgICB7IGV4cHJlc3Npb246ICJzZXRU aW1lb3V0KHRyaWdnZXJBc3NlcnQsIDApIiB9LAotICAgICAgICB7IGV4cHJlc3Npb246ICJzZXRU aW1lb3V0KHRyaWdnZXJCcmVha3BvaW50LCAwKSIgfSwKLSAgICAgICAgeyBleHByZXNzaW9uOiAi c2V0VGltZW91dChmdW5jdGlvbigpIHsgMSsxIH0sIDApIiwgc2V0dXA6IGZ1bmN0aW9uKCkgeyBX ZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnBhdXNlKCk7IH0gfSwKKyAgICAgICAgeyBleHBy ZXNzaW9uOiAic2V0VGltZW91dCh0cmlnZ2VyRXhjZXB0aW9uLCA1MCkiIH0sCisgICAgICAgIHsg ZXhwcmVzc2lvbjogInNldFRpbWVvdXQodHJpZ2dlckRlYnVnZ2VyU3RhdGVtZW50LCA1MCkiIH0s CisgICAgICAgIHsgZXhwcmVzc2lvbjogInNldFRpbWVvdXQodHJpZ2dlckFzc2VydCwgNTApIiB9 LAorICAgICAgICB7IGV4cHJlc3Npb246ICJzZXRUaW1lb3V0KHRyaWdnZXJCcmVha3BvaW50LCA1 MCkiIH0sCisgICAgICAgIHsgZXhwcmVzc2lvbjogInNldFRpbWVvdXQoZnVuY3Rpb24oKSB7IDEr MSB9LCA1MCkiLCBzZXR1cDogZnVuY3Rpb24oKSB7IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFn ZXIucGF1c2UoKTsgfSB9LAogICAgIF07CiAKICAgICBmdW5jdGlvbiBuZXh0VGVzdENhc2UoKQpA QCAtNTMsNiArNTMsMTMgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGlmICghL3BhdXNlLXJl YXNvbnNcLmpzJC8udGVzdChzY3JpcHRPYmplY3QudXJsKSkKICAgICAgICAgICAgIHJldHVybjsK IAorICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5SZXN1bWVkLCBmdW5jdGlvbihldmVu dCkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIlJFU1VNRUQiKTsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QubG9nKCIiKTsKKworICAgICAgICAgICAgbmV4dFRlc3RDYXNlKCk7 CisgICAgICAgIH0pOworCiAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24gPSBzY3JpcHRP YmplY3QuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9uKDMsIDApOwogICAgICAgICB2YXIgYnJlYWtw b2ludCA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludChzb3VyY2VDb2RlTG9jYXRpb24pOwog ICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFkZEJyZWFrcG9pbnQoYnJlYWtw b2ludCk7CkBAIC03MSwxMyArNzgsNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5yZXN1bWUoKTsKICAgICB9KTsKIAotICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdn ZXJNYW5hZ2VyLkV2ZW50LlJlc3VtZWQsIGZ1bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgIEluc3Bl Y3RvclRlc3QubG9nKCJSRVNVTUVEIik7Ci0gICAgICAgIEluc3BlY3RvclRlc3QubG9nKCIiKTsK LQotICAgICAgICBuZXh0VGVzdENhc2UoKTsKLSAgICB9KTsKLQogICAgIEluc3BlY3RvclRlc3Qu cmVsb2FkUGFnZSgpOwogfQogPC9zY3JpcHQ+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvVGVzdEV4cGVjdGF0aW9ucwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvVGVzdEV4cGVjdGF0aW9ucwkocmV2aXNpb24gMTkzNDM0KQorKysgTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTc1MSw3ICs3NTEs NiBAQCB3ZWJraXQub3JnL2IvMTUxODMyIGluc3BlY3Rvci9kZWJ1Z2dlci9iCiBpbnNwZWN0b3Iv ZGVidWdnZXIvc2V0QnJlYWtwb2ludC1kZmctY2FsbGVlLWFuZC1leGFtaW5lLWRmZy1sb2NhbC5o dG1sCiBpbnNwZWN0b3IvZGVidWdnZXIvZGlkU2FtcGxlUHJvYmUtbXVsdGlwbGUtcHJvYmVzLmh0 bWwKIGluc3BlY3Rvci9kZWJ1Z2dlci9uZXN0ZWQtaW5zcGVjdG9ycy5odG1sCi1pbnNwZWN0b3Iv ZGVidWdnZXIvcGF1c2UtcmVhc29uLmh0bWwKIGluc3BlY3Rvci9kZWJ1Z2dlci9yZWdyZXNzLTEz MzE4Mi5odG1sCiAKIHdlYmtpdC5vcmcvYi8xMjQzMTEgY29tcG9zaXRpbmcvcmVnaW9ucy90cmFu c2Zvcm0tdHJhbnNwYXJlbnQtcG9zaXRpb25lZC12aWRlby1pbnNpZGUtcmVnaW9uLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KQEAgLTE0MTAsNCArMTQwOSw0IEBAIHdlYmtpdC5vcmcvYi8xNDk3 NzQgY3NzMy9mb250LWZlYXR1cmUtc2UKIHdlYmtpdC5vcmcvYi8xNDk3NzQgY3NzMy9mb250LWZl YXR1cmUtc2V0dGluZ3MtcmVuZGVyaW5nLmh0bWwgWyBQYXNzIEZhaWx1cmUgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMTQ5Nzc0IGNzczMvZm9udC12YXJpYW50LWFsbC5odG1sIFsg UGFzcyBGYWlsdXJlIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE0OTc3NCBjc3Mz L2ZvbnQtdmFyaWFudC1mb250LWZhY2UtYWxsLmh0bWwgWyBQYXNzIEZhaWx1cmUgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTQ5Nzc0IGNzczMvZm9udC12YXJpYW50LWZvbnQtZmFj ZS1vdmVycmlkZS5odG1sIFsgUGFzcyBGYWlsdXJlIEltYWdlT25seUZhaWx1cmUgXQpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKK3dlYmtpdC5vcmcvYi8xNDk3NzQgY3NzMy9mb250LXZhcmlh bnQtZm9udC1mYWNlLW92ZXJyaWRlLmh0bWwgWyBQYXNzIEZhaWx1cmUgSW1hZ2VPbmx5RmFpbHVy ZSBdCg== 266821 2015-12-07 15:40:08 -0800 2015-12-07 15:40:08 -0800 Updated patch for landing 151892-3.patch text/plain 5381 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNjU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE1LTEyLTA3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENSQVNIOiBDb2RlQmxvY2s6OnNldE9wdGltaXphdGlvblRocmVzaG9sZEJhc2VkT25Db21w aWxhdGlvblJlc3VsdCArIDU2NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUxODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4u CisKKyAgICAgICAgUmV2ZXJ0ZWQgdGhlIGNoYW5nZSBtYWRlIGluIGNoYW5nZSBzZXQgcjE5MzQ5 MS4KKworICAgICAgICBVcGRhdGVkIGNoYW5nZSBpcyB0byBmaW5pc2ggYWxsIGNvbmN1cnJlbnQg Y29tcGlsYXRpb24gYW5kIGluc3RhbGwgdGhlIHJlc3VsdGluZworICAgICAgICBjb2RlIGJsb2Nr cyBiZWZvcmUgd2UgbWFrZSBhbnkgc3RhdGUgY2hhbmdlcyBkdWUgZGVidWdnZXIgYWN0aXZpdHku ICBBZnRlciBhbGwgY29kZQorICAgICAgICBibG9ja3MgaGF2ZSBiZWVuIGlzbnRhbGxlZCwgd2Ug bWFrZSB0aGUgZGVidWdnZXIgc3RhdGUgY2hhbmdlcywgaW5jbHVkaW5nIGpldHRpc29uaW5nCisg ICAgICAgIG9wdGltaXplZCBjb2RlIGJsb2NrIGFuZCBpbnN0YWxsaW5nIGJyZWFrcG9pbnRzLgor CisgICAgICAgIFRoaXMgbWVhbnMgdGhhdCB3ZSB3aWxsIGRpc2NhcmQgYW55IG9wdGltaXplZCBj b2RlIGJsb2NrIGJ1dCB3ZSB3b24ndCBkbyB0aGF0IGFzIHBhcnQKKyAgICAgICAgb2YgdGhlIGlu c3RhbGwgY29kZSBibG9jayBwYXRoLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNw cDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpzZXRPcHRpbWl6YXRpb25UaHJlc2hvbGRCYXNl ZE9uQ29tcGlsYXRpb25SZXN1bHQpOiBSZXZlcnRlZCByMTkzNDkxLgorICAgICAgICAqIGRlYnVn Z2VyL0RlYnVnZ2VyLmNwcDoKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6OnNldFN0ZXBwaW5nTW9k ZSk6CisgICAgICAgIChKU0M6OkRlYnVnZ2VyOjpyZWdpc3RlckNvZGVCbG9jayk6CisgICAgICAg IChKU0M6OkRlYnVnZ2VyOjp0b2dnbGVCcmVha3BvaW50KToKKyAgICAgICAgKEpTQzo6RGVidWdn ZXI6OmNsZWFyQnJlYWtwb2ludHMpOgorICAgICAgICAoSlNDOjpEZWJ1Z2dlcjo6Y2xlYXJEZWJ1 Z2dlclJlcXVlc3RzKToKKyAgICAgICAgQ2FsbCBIZWFwOjpjb21wbGV0ZUFsbERGR1BsYW5zKCkg YmVmb3JlIHVwZGF0aW5nIGNvZGUgYmxvY2tzIGZvciBkZWJ1Z2dpbmcgY2hhbmdlcy4KKworICAg ICAgICAqIGhlYXAvSGVhcC5oOiBNYWRlIGNvbXBsZXRlQWxsREZHUGxhbnMoKSBwdWJsaWMuCisK IDIwMTUtMTItMDcgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAg VXBkYXRlIEpTQyBmZWF0dXJlIGxpc3QgZm9yIHJlc3QgcGFyYW1ldGVycyBhbmQgZ2VuZXJhdG9y cwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJ KHJldmlzaW9uIDE5MzUwNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2Rl QmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzA1LDEyICszNzA1LDYgQEAgdm9pZCBDb2Rl QmxvY2s6OnNldE9wdGltaXphdGlvblRocmVzaG9sZAogICAgIH0KICAgICAKICAgICBDb2RlQmxv Y2sqIHRoZVJlcGxhY2VtZW50ID0gcmVwbGFjZW1lbnQoKTsKLQotICAgIC8vIElmIG91ciByZXBs YWNlbWVudCBpcyBiYXNlbGluZSBjb2RlLCB0aGUgZGVidWdnZXIgaGFzIHByb2JhYmx5IGF0dGFj aGVkIGFuZCByZWNvbXBpbGVkIHRoZSBmdW5jdGlvbi4KLSAgICAvLyBObyB0aHJlc2hvbGQgdG8g Y2hhbmdlLgotICAgIGlmICgocmVzdWx0ID09IENvbXBpbGF0aW9uU3VjY2Vzc2Z1bCkgJiYgKHRo ZVJlcGxhY2VtZW50LT5qaXRUeXBlKCkgPT0gSklUQ29kZTo6QmFzZWxpbmVKSVQpKQotICAgICAg ICByZXR1cm47Ci0KICAgICBpZiAoKHJlc3VsdCA9PSBDb21waWxhdGlvblN1Y2Nlc3NmdWwpICE9 ICh0aGVSZXBsYWNlbWVudCAhPSB0aGlzKSkgewogICAgICAgICBkYXRhTG9nKCp0aGlzLCAiOiB3 ZSBoYXZlIHJlc3VsdCA9ICIsIHJlc3VsdCwgIiBidXQgIik7CiAgICAgICAgIGlmICh0aGVSZXBs YWNlbWVudCA9PSB0aGlzKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0Rl YnVnZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIv RGVidWdnZXIuY3BwCShyZXZpc2lvbiAxOTM1MDQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGVidWdnZXIvRGVidWdnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTIsNiArMjEyLDggQEAg dm9pZCBEZWJ1Z2dlcjo6c2V0U3RlcHBpbmdNb2RlKFN0ZXBwaW5nTQogICAgIGlmIChtb2RlID09 IG1fc3RlcHBpbmdNb2RlKQogICAgICAgICByZXR1cm47CiAKKyAgICBtX3ZtLmhlYXAuY29tcGxl dGVBbGxERkdQbGFucygpOworCiAgICAgbV9zdGVwcGluZ01vZGUgPSBtb2RlOwogICAgIFNldFN0 ZXBwaW5nTW9kZUZ1bmN0b3IgZnVuY3Rvcih0aGlzLCBtb2RlKTsKICAgICBtX3ZtLmhlYXAuZm9y RWFjaENvZGVCbG9jayhmdW5jdG9yKTsKQEAgLTIxOSwxMCArMjIxLDYgQEAgdm9pZCBEZWJ1Z2dl cjo6c2V0U3RlcHBpbmdNb2RlKFN0ZXBwaW5nTQogCiB2b2lkIERlYnVnZ2VyOjpyZWdpc3RlckNv ZGVCbG9jayhDb2RlQmxvY2sqIGNvZGVCbG9jaykKIHsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IG5ldmVyIGhhdmUgdG8gamV0dGlzb24gYSBjb2RlIGJsb2NrIChkdWUgdG8gcGVuZGluZyBicmVh a3BvaW50cwotICAgIC8vIG9yIHN0ZXBwaW5nIG1vZGUpIHRoYXQgaXMgYmVpbmcgcmVnaXN0ZXJl ZC4gb3BlcmF0aW9uT3B0aW1pemUoKSBzaG91bGQgaGF2ZQotICAgIC8vIHByZXZlbnRlZCB0aGUg b3B0aW1pemluZyBvZiBzdWNoIGNvZGUgYmxvY2tzIGluIHRoZSBmaXJzdCBwbGFjZS4gRmluZCBh IHdheSB0bwotICAgIC8vIGV4cHJlc3MgdGhpcyB3aXRoIGdyZWF0ZXIgY2xhcml0eSBpbiB0aGUg Y29kZS4gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYjEzMTc3MT4uCiAgICAgYXBwbHlCcmVha3Bv aW50cyhjb2RlQmxvY2spOwogICAgIGlmIChpc1N0ZXBwaW5nKCkpCiAgICAgICAgIGNvZGVCbG9j ay0+c2V0U3RlcHBpbmdNb2RlKENvZGVCbG9jazo6U3RlcHBpbmdNb2RlRW5hYmxlZCk7CkBAIC0y OTksNiArMjk3LDggQEAgcHJpdmF0ZToKIAogdm9pZCBEZWJ1Z2dlcjo6dG9nZ2xlQnJlYWtwb2lu dChCcmVha3BvaW50JiBicmVha3BvaW50LCBEZWJ1Z2dlcjo6QnJlYWtwb2ludFN0YXRlIGVuYWJs ZWRPck5vdCkKIHsKKyAgICBtX3ZtLmhlYXAuY29tcGxldGVBbGxERkdQbGFucygpOworCiAgICAg VG9nZ2xlQnJlYWtwb2ludEZ1bmN0b3IgZnVuY3Rvcih0aGlzLCBicmVha3BvaW50LCBlbmFibGVk T3JOb3QpOwogICAgIG1fdm0uaGVhcC5mb3JFYWNoQ29kZUJsb2NrKGZ1bmN0b3IpOwogfQpAQCAt NDcwLDYgKzQ3MCw4IEBAIHByaXZhdGU6CiAKIHZvaWQgRGVidWdnZXI6OmNsZWFyQnJlYWtwb2lu dHMoKQogeworICAgIG1fdm0uaGVhcC5jb21wbGV0ZUFsbERGR1BsYW5zKCk7CisKICAgICBtX3Rv cEJyZWFrcG9pbnRJRCA9IG5vQnJlYWtwb2ludElEOwogICAgIG1fYnJlYWtwb2ludElEVG9CcmVh a3BvaW50LmNsZWFyKCk7CiAgICAgbV9zb3VyY2VJRFRvQnJlYWtwb2ludHMuY2xlYXIoKTsKQEAg LTQ5OCw2ICs1MDAsOCBAQCBwcml2YXRlOgogCiB2b2lkIERlYnVnZ2VyOjpjbGVhckRlYnVnZ2Vy UmVxdWVzdHMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKIHsKKyAgICBtX3ZtLmhlYXAu Y29tcGxldGVBbGxERkdQbGFucygpOworCiAgICAgQ2xlYXJEZWJ1Z2dlclJlcXVlc3RzRnVuY3Rv ciBmdW5jdG9yKGdsb2JhbE9iamVjdCk7CiAgICAgbV92bS5oZWFwLmZvckVhY2hDb2RlQmxvY2so ZnVuY3Rvcik7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCShyZXZpc2lvbiAx OTM1MDQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE2NCw2ICsxNjQsOCBAQCBwdWJsaWM6CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9p ZCBjb2xsZWN0KEhlYXBPcGVyYXRpb24gY29sbGVjdGlvblR5cGUgPSBBbnlDb2xsZWN0aW9uKTsK ICAgICBib29sIGNvbGxlY3RJZk5lY2Vzc2FyeU9yRGVmZXIoKTsgLy8gUmV0dXJucyB0cnVlIGlm IGl0IGRpZCBjb2xsZWN0LgogCisgICAgdm9pZCBjb21wbGV0ZUFsbERGR1BsYW5zKCk7CisgICAg CiAgICAgLy8gVXNlIHRoaXMgQVBJIHRvIHJlcG9ydCBub24tR0MgbWVtb3J5IHJlZmVyZW5jZWQg YnkgR0Mgb2JqZWN0cy4gQmUgc3VyZSB0bwogICAgIC8vIGNhbGwgYm90aCBvZiB0aGVzZSBmdW5j dGlvbnM6IENhbGxpbmcgb25seSBvbmUgbWF5IHRyaWdnZXIgY2F0YXN0cm9waWMKICAgICAvLyBt ZW1vcnkgZ3Jvd3RoLgpAQCAtMjkwLDggKzI5Miw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBmbHVz aFdyaXRlQmFycmllckJ1ZmZlcigpOwogICAgIHZvaWQgc3RvcEFsbG9jYXRpb24oKTsKICAgICAK LSAgICB2b2lkIGNvbXBsZXRlQWxsREZHUGxhbnMoKTsKLQogICAgIHZvaWQgbWFya1Jvb3RzKGRv dWJsZSBnY1N0YXJ0VGltZSwgdm9pZCogc3RhY2tPcmlnaW4sIHZvaWQqIHN0YWNrVG9wLCBNYWNo aW5lVGhyZWFkczo6UmVnaXN0ZXJTdGF0ZSYpOwogICAgIHZvaWQgZ2F0aGVyU3RhY2tSb290cyhD b25zZXJ2YXRpdmVSb290cyYsIHZvaWQqIHN0YWNrT3JpZ2luLCB2b2lkKiBzdGFja1RvcCwgTWFj aGluZVRocmVhZHM6OlJlZ2lzdGVyU3RhdGUmKTsKICAgICB2b2lkIGdhdGhlckpTU3RhY2tSb290 cyhDb25zZXJ2YXRpdmVSb290cyYpOwo=