111777 2013-03-07 14:28:59 -0800 Crash when updating predictions below JSC::arrayProtoFuncForEach on tuaw.com article 2013-03-14 14:23:09 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED http://www.tuaw.com/2012/12/29/5-things-i-want-to-see-from-apple-in-2013/ InRadar P2 Normal --- 112380 1 msaboff msaboff oldest_to_newest 850489 0 msaboff 2013-03-07 14:28:59 -0800 Investigating this, I've determined that the issue is due to a register allocation in the middle of generating control flow and we are under register pressure causing us to spill on one path in the control flow but not the other two. This is in SpeculativeJIT::nonSpeculativeNonPeepholeCompareNull() in dfg/DFGSpeculativeJit32_64.cpp. Inspection shows that the problem also exists in dfg/DFGSpeculativeJit64.cpp. Patch forth coming. From <rdar://problem/13185728>. 850583 1 192101 msaboff 2013-03-07 16:07:51 -0800 Created attachment 192101 Patch 850596 2 msaboff 2013-03-07 16:21:42 -0800 Committed r145150: <http://trac.webkit.org/changeset/145150> 192101 2013-03-07 16:07:51 -0800 2013-03-07 16:09:31 -0800 Patch 111777.patch text/plain 11350 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ1MTQ3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDEzLTAzLTA3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENyYXNoIHdoZW4gdXBkYXRpbmcgcHJlZGljdGlvbnMgYmVsb3cgSlNDOjphcnJheVByb3Rv RnVuY0ZvckVhY2ggb24gdHVhdy5jb20gYXJ0aWNsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZWQgcmVnaXN0ZXIgYWxsb2NhdGlvbnMgdG8gYmUg YWJvdmUgYW55IGdlbmVyYXRlZCBjb250cm9sIGZsb3cgc28gdGhhdCBhbnkKKyAgICAgICAgcmVz dWx0aW5nIHNwaWxsIHdvdWxkIGJlIHZpc2libGUgdG8gYWxsIHN1YnNlcXVlbnRseSBnZW5lcmF0 ZWQgY29kZS4KKworICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcDoKKyAg ICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6bm9uU3BlY3VsYXRpdmVOb25QZWVwaG9s ZUNvbXBhcmVOdWxsKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6bm9uU3Bl Y3VsYXRpdmVQZWVwaG9sZUJyYW5jaE51bGwpOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0 aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHA6 CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6Om5vblNwZWN1bGF0aXZlTm9uUGVl cGhvbGVDb21wYXJlTnVsbCk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6Om5v blNwZWN1bGF0aXZlUGVlcGhvbGVCcmFuY2hOdWxsKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTMtMDMtMDcgIEZpbGlwIFBpemxvICA8ZnBpemxv QGFwcGxlLmNvbT4KIAogICAgICAgICBERkcgc2hvdWxkIG5vdCBnZXQgY29ycnVwdGVkIElSIGlu IHRoZSBjYXNlIG9mIGNvZGUgdGhhdCBpcyBkZWFkLCB1bnJlYWNoYWJsZSwgYW5kIGNvbnRhaW5z IGEgY2hhaW4gb2Ygbm9kZXMgdGhhdCB1c2UgZWFjaCBvdGhlciBpbiBhbiB1bnR5cGVkIHdheQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklUMzJfNjQuY3BwCShyZXZpc2lvbiAxNDUxMzUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODYsMTUg KzM4NiwyMSBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpub25TcGVjdWxhdGl2ZU5vblBlCiAgICAg R1BSUmVnIHJlc3VsdFBheWxvYWRHUFIgPSByZXN1bHRQYXlsb2FkLmdwcigpOwogCiAgICAgSklU Q29tcGlsZXI6Okp1bXAgbm90Q2VsbDsKLSAgICBpZiAoIWlzS25vd25DZWxsKG9wZXJhbmQubm9k ZSgpKSkKLSAgICAgICAgbm90Q2VsbCA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpO b3RFcXVhbCwgYXJnVGFnR1BSLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOwotCiAg ICAgSklUQ29tcGlsZXI6Okp1bXAgbm90TWFzcXVlcmFkZXNBc1VuZGVmaW5lZDsgICAKICAgICBp ZiAobV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3IobV9jdXJyZW50Tm9kZS0+Y29kZU9yaWdp biktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50KCktPmlzU3RpbGxWYWxpZCgpKSB7 CisgICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2RlKCkpKQorICAgICAgICAgICAg bm90Q2VsbCA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgYXJnVGFn R1BSLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOworCiAgICAgICAgIG1faml0Lmdy YXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG1fY3VycmVudE5vZGUtPmNvZGVPcmlnaW4pLT5tYXNxdWVy YWRlc0FzVW5kZWZpbmVkV2F0Y2hwb2ludCgpLT5hZGQoc3BlY3VsYXRpb25XYXRjaHBvaW50KCkp OwogICAgICAgICBtX2ppdC5tb3ZlKGludmVydCA/IFRydXN0ZWRJbW0zMigxKSA6IFRydXN0ZWRJ bW0zMigwKSwgcmVzdWx0UGF5bG9hZEdQUik7CiAgICAgICAgIG5vdE1hc3F1ZXJhZGVzQXNVbmRl ZmluZWQgPSBtX2ppdC5qdW1wKCk7CiAgICAgfSBlbHNlIHsKKyAgICAgICAgR1BSVGVtcG9yYXJ5 IGxvY2FsR2xvYmFsT2JqZWN0KHRoaXMpOworICAgICAgICBHUFJUZW1wb3JhcnkgcmVtb3RlR2xv YmFsT2JqZWN0KHRoaXMpOworCisgICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2Rl KCkpKQorICAgICAgICAgICAgbm90Q2VsbCA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVy OjpOb3RFcXVhbCwgYXJnVGFnR1BSLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOwor CiAgICAgICAgIG1faml0LmxvYWRQdHIoSklUQ29tcGlsZXI6OkFkZHJlc3MoYXJnUGF5bG9hZEdQ UiwgSlNDZWxsOjpzdHJ1Y3R1cmVPZmZzZXQoKSksIHJlc3VsdFBheWxvYWRHUFIpOwogICAgICAg ICBKSVRDb21waWxlcjo6SnVtcCBpc01hc3F1ZXJhZGVzQXNVbmRlZmluZWQgPSBtX2ppdC5icmFu Y2hUZXN0OChKSVRDb21waWxlcjo6Tm9uWmVybywgSklUQ29tcGlsZXI6OkFkZHJlc3MocmVzdWx0 UGF5bG9hZEdQUiwgU3RydWN0dXJlOjp0eXBlSW5mb0ZsYWdzT2Zmc2V0KCkpLCBKSVRDb21waWxl cjo6VHJ1c3RlZEltbTMyKE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQpKTsKICAgICAgICAgCkBAIC00 MDIsOCArNDA4LDYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6bm9uU3BlY3VsYXRpdmVOb25QZQog ICAgICAgICBub3RNYXNxdWVyYWRlc0FzVW5kZWZpbmVkID0gbV9qaXQuanVtcCgpOwogCiAgICAg ICAgIGlzTWFzcXVlcmFkZXNBc1VuZGVmaW5lZC5saW5rKCZtX2ppdCk7Ci0gICAgICAgIEdQUlRl bXBvcmFyeSBsb2NhbEdsb2JhbE9iamVjdCh0aGlzKTsKLSAgICAgICAgR1BSVGVtcG9yYXJ5IHJl bW90ZUdsb2JhbE9iamVjdCh0aGlzKTsKICAgICAgICAgR1BSUmVnIGxvY2FsR2xvYmFsT2JqZWN0 R1BSID0gbG9jYWxHbG9iYWxPYmplY3QuZ3ByKCk7CiAgICAgICAgIEdQUlJlZyByZW1vdGVHbG9i YWxPYmplY3RHUFIgPSByZW1vdGVHbG9iYWxPYmplY3QuZ3ByKCk7CiAgICAgICAgIG1faml0Lm1v dmUoSklUQ29tcGlsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RG b3IobV9jdXJyZW50Tm9kZS0+Y29kZU9yaWdpbikpLCBsb2NhbEdsb2JhbE9iamVjdEdQUik7CkBA IC00NDcsMjEgKzQ1MSwyNSBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpub25TcGVjdWxhdGl2ZVBl ZXBoCiAgICAgCiAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzLCBhcmcpOwogICAgIEdQUlJl ZyByZXN1bHRHUFIgPSByZXN1bHQuZ3ByKCk7Ci0gICAgCisKICAgICBKSVRDb21waWxlcjo6SnVt cCBub3RDZWxsOwotICAgIAotICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2RlKCkpKQot ICAgICAgICBub3RDZWxsID0gbV9qaXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFs LCBhcmdUYWdHUFIsIFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSk7Ci0gICAgCisKICAg ICBpZiAobV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3IobV9jdXJyZW50Tm9kZS0+Y29kZU9y aWdpbiktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50KCktPmlzU3RpbGxWYWxpZCgp KSB7CisgICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2RlKCkpKQorICAgICAgICAg ICAgbm90Q2VsbCA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgYXJn VGFnR1BSLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOworCiAgICAgICAgIG1faml0 LmdyYXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG1fY3VycmVudE5vZGUtPmNvZGVPcmlnaW4pLT5tYXNx dWVyYWRlc0FzVW5kZWZpbmVkV2F0Y2hwb2ludCgpLT5hZGQoc3BlY3VsYXRpb25XYXRjaHBvaW50 KCkpOwogICAgICAgICBqdW1wKGludmVydCA/IHRha2VuIDogbm90VGFrZW4sIEZvcmNlSnVtcCk7 CiAgICAgfSBlbHNlIHsKKyAgICAgICAgR1BSVGVtcG9yYXJ5IGxvY2FsR2xvYmFsT2JqZWN0KHRo aXMpOworICAgICAgICBHUFJUZW1wb3JhcnkgcmVtb3RlR2xvYmFsT2JqZWN0KHRoaXMpOworCisg ICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2RlKCkpKQorICAgICAgICAgICAgbm90 Q2VsbCA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgYXJnVGFnR1BS LCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykpOworCiAgICAgICAgIG1faml0LmxvYWRQ dHIoSklUQ29tcGlsZXI6OkFkZHJlc3MoYXJnUGF5bG9hZEdQUiwgSlNDZWxsOjpzdHJ1Y3R1cmVP ZmZzZXQoKSksIHJlc3VsdEdQUik7CiAgICAgICAgIGJyYW5jaFRlc3Q4KEpJVENvbXBpbGVyOjpa ZXJvLCBKSVRDb21waWxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIFN0cnVjdHVyZTo6dHlwZUluZm9G bGFnc09mZnNldCgpKSwgSklUQ29tcGlsZXI6OlRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5k ZWZpbmVkKSwgaW52ZXJ0ID8gdGFrZW4gOiBub3RUYWtlbik7CiAgICAKLSAgICAgICAgR1BSVGVt cG9yYXJ5IGxvY2FsR2xvYmFsT2JqZWN0KHRoaXMpOwotICAgICAgICBHUFJUZW1wb3JhcnkgcmVt b3RlR2xvYmFsT2JqZWN0KHRoaXMpOwogICAgICAgICBHUFJSZWcgbG9jYWxHbG9iYWxPYmplY3RH UFIgPSBsb2NhbEdsb2JhbE9iamVjdC5ncHIoKTsKICAgICAgICAgR1BSUmVnIHJlbW90ZUdsb2Jh bE9iamVjdEdQUiA9IHJlbW90ZUdsb2JhbE9iamVjdC5ncHIoKTsKICAgICAgICAgbV9qaXQubW92 ZShUcnVzdGVkSW1tUHRyKG1faml0LmdyYXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG1fY3VycmVudE5v ZGUtPmNvZGVPcmlnaW4pKSwgbG9jYWxHbG9iYWxPYmplY3RHUFIpOwpAQCAtNDI1NCw3ICs0MjYy LDkgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgIGNhc2Ug SXNVbmRlZmluZWQ6IHsKICAgICAgICAgSlNWYWx1ZU9wZXJhbmQgdmFsdWUodGhpcywgbm9kZS0+ Y2hpbGQxKCkpOwogICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMpOwotICAgICAgICAK KyAgICAgICAgR1BSVGVtcG9yYXJ5IGxvY2FsR2xvYmFsT2JqZWN0KHRoaXMpOworICAgICAgICBH UFJUZW1wb3JhcnkgcmVtb3RlR2xvYmFsT2JqZWN0KHRoaXMpOworCiAgICAgICAgIEpJVENvbXBp bGVyOjpKdW1wIGlzQ2VsbCA9IG1faml0LmJyYW5jaDMyKEpJVENvbXBpbGVyOjpFcXVhbCwgdmFs dWUudGFnR1BSKCksIEpJVENvbXBpbGVyOjpUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZykp OwogICAgICAgICAKICAgICAgICAgbV9qaXQuY29tcGFyZTMyKEpJVENvbXBpbGVyOjpFcXVhbCwg dmFsdWUudGFnR1BSKCksIFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpVbmRlZmluZWRUYWcpLCByZXN1 bHQuZ3ByKCkpOwpAQCAtNDI3Myw4ICs0MjgzLDYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29t cGlsZShOb2RlKiBub2RlKQogICAgICAgICAgICAgbm90TWFzcXVlcmFkZXNBc1VuZGVmaW5lZCA9 IG1faml0Lmp1bXAoKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaXNNYXNxdWVyYWRlc0Fz VW5kZWZpbmVkLmxpbmsoJm1faml0KTsKLSAgICAgICAgICAgIEdQUlRlbXBvcmFyeSBsb2NhbEds b2JhbE9iamVjdCh0aGlzKTsKLSAgICAgICAgICAgIEdQUlRlbXBvcmFyeSByZW1vdGVHbG9iYWxP YmplY3QodGhpcyk7CiAgICAgICAgICAgICBHUFJSZWcgbG9jYWxHbG9iYWxPYmplY3RHUFIgPSBs b2NhbEdsb2JhbE9iamVjdC5ncHIoKTsKICAgICAgICAgICAgIEdQUlJlZyByZW1vdGVHbG9iYWxP YmplY3RHUFIgPSByZW1vdGVHbG9iYWxPYmplY3QuZ3ByKCk7CiAgICAgICAgICAgICBtX2ppdC5t b3ZlKFRydXN0ZWRJbW1QdHIobV9qaXQuZ2xvYmFsT2JqZWN0Rm9yKG5vZGUtPmNvZGVPcmlnaW4p KSwgbG9jYWxHbG9iYWxPYmplY3RHUFIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCShyZXZpc2lvbiAxNDUxMzUpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMzQsMTUgKzMzNCwyMSBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpub25TcGVj dWxhdGl2ZU5vblBlCiAgICAgCiAgICAgSklUQ29tcGlsZXI6Okp1bXAgbm90Q2VsbDsKICAgICAK LSAgICBpZiAoIWlzS25vd25DZWxsKG9wZXJhbmQubm9kZSgpKSkKLSAgICAgICAgbm90Q2VsbCA9 IG1faml0LmJyYW5jaFRlc3Q2NChNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVybywgYXJnR1BSLCBHUFJJ bmZvOjp0YWdNYXNrUmVnaXN0ZXIpOwotICAgCiAgICAgSklUQ29tcGlsZXI6Okp1bXAgbm90TWFz cXVlcmFkZXNBc1VuZGVmaW5lZDsKICAgICBpZiAobV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RG b3Iob3BlcmFuZC0+Y29kZU9yaWdpbiktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50 KCktPmlzU3RpbGxWYWxpZCgpKSB7CisgICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5u b2RlKCkpKQorICAgICAgICAgICAgbm90Q2VsbCA9IG1faml0LmJyYW5jaFRlc3Q2NChNYWNyb0Fz c2VtYmxlcjo6Tm9uWmVybywgYXJnR1BSLCBHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIpOworCiAg ICAgICAgIG1faml0LmdyYXBoKCkuZ2xvYmFsT2JqZWN0Rm9yKG9wZXJhbmQtPmNvZGVPcmlnaW4p LT5tYXNxdWVyYWRlc0FzVW5kZWZpbmVkV2F0Y2hwb2ludCgpLT5hZGQoc3BlY3VsYXRpb25XYXRj aHBvaW50KCkpOwogICAgICAgICBtX2ppdC5tb3ZlKGludmVydCA/IFRydXN0ZWRJbW0zMigxKSA6 IFRydXN0ZWRJbW0zMigwKSwgcmVzdWx0R1BSKTsKICAgICAgICAgbm90TWFzcXVlcmFkZXNBc1Vu ZGVmaW5lZCA9IG1faml0Lmp1bXAoKTsKICAgICB9IGVsc2UgeworICAgICAgICBHUFJUZW1wb3Jh cnkgbG9jYWxHbG9iYWxPYmplY3QodGhpcyk7CisgICAgICAgIEdQUlRlbXBvcmFyeSByZW1vdGVH bG9iYWxPYmplY3QodGhpcyk7CisKKyAgICAgICAgaWYgKCFpc0tub3duQ2VsbChvcGVyYW5kLm5v ZGUoKSkpCisgICAgICAgICAgICBub3RDZWxsID0gbV9qaXQuYnJhbmNoVGVzdDY0KE1hY3JvQXNz ZW1ibGVyOjpOb25aZXJvLCBhcmdHUFIsIEdQUkluZm86OnRhZ01hc2tSZWdpc3Rlcik7CisKICAg ICAgICAgbV9qaXQubG9hZFB0cihKSVRDb21waWxlcjo6QWRkcmVzcyhhcmdHUFIsIEpTQ2VsbDo6 c3RydWN0dXJlT2Zmc2V0KCkpLCByZXN1bHRHUFIpOwogICAgICAgICBKSVRDb21waWxlcjo6SnVt cCBpc01hc3F1ZXJhZGVzQXNVbmRlZmluZWQgPSBtX2ppdC5icmFuY2hUZXN0OChKSVRDb21waWxl cjo6Tm9uWmVybywgSklUQ29tcGlsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBTdHJ1Y3R1cmU6OnR5 cGVJbmZvRmxhZ3NPZmZzZXQoKSksIEpJVENvbXBpbGVyOjpUcnVzdGVkSW1tMzIoTWFzcXVlcmFk ZXNBc1VuZGVmaW5lZCkpOwogCkBAIC0zNTAsOCArMzU2LDYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6bm9uU3BlY3VsYXRpdmVOb25QZQogICAgICAgICBub3RNYXNxdWVyYWRlc0FzVW5kZWZpbmVk ID0gbV9qaXQuanVtcCgpOwogCiAgICAgICAgIGlzTWFzcXVlcmFkZXNBc1VuZGVmaW5lZC5saW5r KCZtX2ppdCk7Ci0gICAgICAgIEdQUlRlbXBvcmFyeSBsb2NhbEdsb2JhbE9iamVjdCh0aGlzKTsK LSAgICAgICAgR1BSVGVtcG9yYXJ5IHJlbW90ZUdsb2JhbE9iamVjdCh0aGlzKTsKICAgICAgICAg R1BSUmVnIGxvY2FsR2xvYmFsT2JqZWN0R1BSID0gbG9jYWxHbG9iYWxPYmplY3QuZ3ByKCk7CiAg ICAgICAgIEdQUlJlZyByZW1vdGVHbG9iYWxPYmplY3RHUFIgPSByZW1vdGVHbG9iYWxPYmplY3Qu Z3ByKCk7CiAgICAgICAgIG1faml0Lm1vdmUoSklUQ29tcGlsZXI6OlRydXN0ZWRJbW1QdHIobV9q aXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iob3BlcmFuZC0+Y29kZU9yaWdpbikpLCBsb2NhbEds b2JhbE9iamVjdEdQUik7CkBAIC0zOTcsMTggKzQwMSwyMiBAQCB2b2lkIFNwZWN1bGF0aXZlSklU Ojpub25TcGVjdWxhdGl2ZVBlZXBoCiAgICAgCiAgICAgSklUQ29tcGlsZXI6Okp1bXAgbm90Q2Vs bDsKICAgICAKLSAgICBpZiAoIWlzS25vd25DZWxsKG9wZXJhbmQubm9kZSgpKSkKLSAgICAgICAg bm90Q2VsbCA9IG1faml0LmJyYW5jaFRlc3Q2NChNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVybywgYXJn R1BSLCBHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIpOwotICAgIAogICAgIGlmIChtX2ppdC5ncmFw aCgpLmdsb2JhbE9iamVjdEZvcihvcGVyYW5kLT5jb2RlT3JpZ2luKS0+bWFzcXVlcmFkZXNBc1Vu ZGVmaW5lZFdhdGNocG9pbnQoKS0+aXNTdGlsbFZhbGlkKCkpIHsKKyAgICAgICAgaWYgKCFpc0tu b3duQ2VsbChvcGVyYW5kLm5vZGUoKSkpCisgICAgICAgICAgICBub3RDZWxsID0gbV9qaXQuYnJh bmNoVGVzdDY0KE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCBhcmdHUFIsIEdQUkluZm86OnRhZ01h c2tSZWdpc3Rlcik7CisKICAgICAgICAgbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iob3Bl cmFuZC0+Y29kZU9yaWdpbiktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50KCktPmFk ZChzcGVjdWxhdGlvbldhdGNocG9pbnQoKSk7CiAgICAgICAgIGp1bXAoaW52ZXJ0ID8gdGFrZW4g OiBub3RUYWtlbiwgRm9yY2VKdW1wKTsKICAgICB9IGVsc2UgewotICAgICAgICBtX2ppdC5sb2Fk UHRyKEpJVENvbXBpbGVyOjpBZGRyZXNzKGFyZ0dQUiwgSlNDZWxsOjpzdHJ1Y3R1cmVPZmZzZXQo KSksIHJlc3VsdEdQUik7Ci0gICAgICAgIGJyYW5jaFRlc3Q4KEpJVENvbXBpbGVyOjpaZXJvLCBK SVRDb21waWxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIFN0cnVjdHVyZTo6dHlwZUluZm9GbGFnc09m ZnNldCgpKSwgSklUQ29tcGlsZXI6OlRydXN0ZWRJbW0zMihNYXNxdWVyYWRlc0FzVW5kZWZpbmVk KSwgaW52ZXJ0ID8gdGFrZW4gOiBub3RUYWtlbik7Ci0gICAKICAgICAgICAgR1BSVGVtcG9yYXJ5 IGxvY2FsR2xvYmFsT2JqZWN0KHRoaXMpOwogICAgICAgICBHUFJUZW1wb3JhcnkgcmVtb3RlR2xv YmFsT2JqZWN0KHRoaXMpOworCisgICAgICAgIGlmICghaXNLbm93bkNlbGwob3BlcmFuZC5ub2Rl KCkpKQorICAgICAgICAgICAgbm90Q2VsbCA9IG1faml0LmJyYW5jaFRlc3Q2NChNYWNyb0Fzc2Vt Ymxlcjo6Tm9uWmVybywgYXJnR1BSLCBHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIpOworCisgICAg ICAgIG1faml0LmxvYWRQdHIoSklUQ29tcGlsZXI6OkFkZHJlc3MoYXJnR1BSLCBKU0NlbGw6OnN0 cnVjdHVyZU9mZnNldCgpKSwgcmVzdWx0R1BSKTsKKyAgICAgICAgYnJhbmNoVGVzdDgoSklUQ29t cGlsZXI6Olplcm8sIEpJVENvbXBpbGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwgU3RydWN0dXJlOjp0 eXBlSW5mb0ZsYWdzT2Zmc2V0KCkpLCBKSVRDb21waWxlcjo6VHJ1c3RlZEltbTMyKE1hc3F1ZXJh ZGVzQXNVbmRlZmluZWQpLCBpbnZlcnQgPyB0YWtlbiA6IG5vdFRha2VuKTsKKwogICAgICAgICBH UFJSZWcgbG9jYWxHbG9iYWxPYmplY3RHUFIgPSBsb2NhbEdsb2JhbE9iamVjdC5ncHIoKTsKICAg ICAgICAgR1BSUmVnIHJlbW90ZUdsb2JhbE9iamVjdEdQUiA9IHJlbW90ZUdsb2JhbE9iamVjdC5n cHIoKTsKICAgICAgICAgbV9qaXQubW92ZShUcnVzdGVkSW1tUHRyKG1faml0LmdyYXBoKCkuZ2xv YmFsT2JqZWN0Rm9yKG9wZXJhbmQtPmNvZGVPcmlnaW4pKSwgbG9jYWxHbG9iYWxPYmplY3RHUFIp OwpAQCAtNDE0NCw5ICs0MTUyLDExIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9k ZSogbm9kZSkKICAgICBjYXNlIElzVW5kZWZpbmVkOiB7CiAgICAgICAgIEpTVmFsdWVPcGVyYW5k IHZhbHVlKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3Vs dCh0aGlzKTsKLSAgICAgICAgCisgICAgICAgIEdQUlRlbXBvcmFyeSBsb2NhbEdsb2JhbE9iamVj dCh0aGlzKTsKKyAgICAgICAgR1BSVGVtcG9yYXJ5IHJlbW90ZUdsb2JhbE9iamVjdCh0aGlzKTsK KwogICAgICAgICBKSVRDb21waWxlcjo6SnVtcCBpc0NlbGwgPSBtX2ppdC5icmFuY2hUZXN0NjQo SklUQ29tcGlsZXI6Olplcm8sIHZhbHVlLmdwcigpLCBHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIp OwotICAgICAgICAKKwogICAgICAgICBtX2ppdC5jb21wYXJlNjQoSklUQ29tcGlsZXI6OkVxdWFs LCB2YWx1ZS5ncHIoKSwgVHJ1c3RlZEltbTMyKFZhbHVlVW5kZWZpbmVkKSwgcmVzdWx0Lmdwcigp KTsKICAgICAgICAgSklUQ29tcGlsZXI6Okp1bXAgZG9uZSA9IG1faml0Lmp1bXAoKTsKICAgICAg ICAgCkBAIC00MTYzLDggKzQxNzMsNiBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5v ZGUqIG5vZGUpCiAgICAgICAgICAgICBub3RNYXNxdWVyYWRlc0FzVW5kZWZpbmVkID0gbV9qaXQu anVtcCgpOwogCiAgICAgICAgICAgICBpc01hc3F1ZXJhZGVzQXNVbmRlZmluZWQubGluaygmbV9q aXQpOwotICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IGxvY2FsR2xvYmFsT2JqZWN0KHRoaXMpOwot ICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlbW90ZUdsb2JhbE9iamVjdCh0aGlzKTsKICAgICAg ICAgICAgIEdQUlJlZyBsb2NhbEdsb2JhbE9iamVjdEdQUiA9IGxvY2FsR2xvYmFsT2JqZWN0Lmdw cigpOwogICAgICAgICAgICAgR1BSUmVnIHJlbW90ZUdsb2JhbE9iamVjdEdQUiA9IHJlbW90ZUds b2JhbE9iamVjdC5ncHIoKTsKICAgICAgICAgICAgIG1faml0Lm1vdmUoVHJ1c3RlZEltbVB0ciht X2ppdC5nbG9iYWxPYmplY3RGb3Iobm9kZS0+Y29kZU9yaWdpbikpLCBsb2NhbEdsb2JhbE9iamVj dEdQUik7Cg==