74336 2011-12-12 14:27:53 -0800 Remove uses of JSByteArray vptr 2011-12-18 12:22:28 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74332 74331 1 mhahnenberg mhahnenberg oldest_to_newest 519471 0 mhahnenberg 2011-12-12 14:27:53 -0800 Same as bug 74333, but for JSByteArray. 519509 1 118859 mhahnenberg 2011-12-12 14:50:00 -0800 Created attachment 118859 Remove uses of JSByteArray vptr No changelog (see bug 74331). 519536 2 118859 ggaren 2011-12-12 15:00:58 -0800 Comment on attachment 118859 Remove uses of JSByteArray vptr r=me 118859 2011-12-12 14:50:00 -0800 2011-12-12 15:00:58 -0800 Remove uses of JSByteArray vptr 0004-Removed-all-vptr-optimizations-for-JSByteArray-in-fa.patch text/plain 15268 mhahnenberg RnJvbSBiZjUyYThjNjQzMTUwN2ExZTQyOWNlZThjNzJmNDkzMWE1OThmNjdkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIEhhaG5lbmJlcmcgPG1oYWhuZW5iZXJnQGFwcGxlLmNv bT4KRGF0ZTogTW9uLCA1IERlYyAyMDExIDE3OjQ5OjU5IC0wODAwClN1YmplY3Q6IFtQQVRDSCAw NC8xOF0gUmVtb3ZlZCBhbGwgdnB0ciBvcHRpbWl6YXRpb25zIGZvciBKU0J5dGVBcnJheSBpbgog ZmF2b3Igb2YgdXNpbmcgdGhlIENsYXNzSW5mbyBpbnN0ZWFkCgotLS0KIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAgICAgICAgfCAgICA2ICsrLS0tLQogU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAgICB8ICAgIDYgKysrLS0t CiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwIHwgICAg NCArKy0tCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcCAgICAgICAgICAg IHwgICAxNSArKysrKystLS0tLS0tLS0KIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT Qnl0ZUFycmF5LmNwcCAgICAgfCAgICAyICstCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0J5dGVBcnJheS5oICAgICAgIHwgICAgMiArLQogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNHbG9iYWxEYXRhLmNwcCAgICB8ICAgMTEgKy0tLS0tLS0tLS0KIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5oICAgICAgfCAgICAxIC0KIDggZmlsZXMg Y2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKaW5kZXggODVjYmVmYi4uOWVkODVjOSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCkBAIC0xNTUs NyArMTU1LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIHB1dEJ5VmFsKEV4ZWNTdGF0ZSogZXhlYywg SlNWYWx1ZSBiYXNlVmFsdWUsIHVpbnQzMl90IGluZGV4LAogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgaWYgKGlzSlNCeXRlQXJyYXkoZ2xvYmFsRGF0YSwgYmFzZVZhbHVlKSAmJiBhc0J5 dGVBcnJheShiYXNlVmFsdWUpLT5jYW5BY2Nlc3NJbmRleChpbmRleCkpIHsKKyAgICBpZiAoaXNK U0J5dGVBcnJheShiYXNlVmFsdWUpICYmIGFzQnl0ZUFycmF5KGJhc2VWYWx1ZSktPmNhbkFjY2Vz c0luZGV4KGluZGV4KSkgewogICAgICAgICBKU0J5dGVBcnJheSogYnl0ZUFycmF5ID0gYXNCeXRl QXJyYXkoYmFzZVZhbHVlKTsKICAgICAgICAgLy8gRklYTUU6IHRoZSBKSVRzdHViIHVzZWQgdG8g cmVsaW5rIHRoaXMgdG8gYW4gb3B0aW1pemVkIGZvcm0hCiAgICAgICAgIGlmICh2YWx1ZS5pc0lu dDMyKCkpIHsKQEAgLTI2OSw4ICsyNjksNiBAQCBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9O IG9wZXJhdGlvblZhbHVlQWRkTm90TnVtYmVyKEV4ZWNTdGF0ZSogZXhlYywgRW5jb2RlZAogCiBz dGF0aWMgaW5saW5lIEVuY29kZWRKU1ZhbHVlIGdldEJ5VmFsKEV4ZWNTdGF0ZSogZXhlYywgSlND ZWxsKiBiYXNlLCB1aW50MzJfdCBpbmRleCkKIHsKLSAgICBKU0dsb2JhbERhdGEqIGdsb2JhbERh dGEgPSAmZXhlYy0+Z2xvYmFsRGF0YSgpOwotCiAgICAgLy8gRklYTUU6IHRoZSBKSVQgdXNlZCB0 byBoYW5kbGUgdGhlc2UgaW4gY29tcGlsZWQgY29kZSEKICAgICBpZiAoaXNKU0FycmF5KGJhc2Up ICYmIGFzQXJyYXkoYmFzZSktPmNhbkdldEluZGV4KGluZGV4KSkKICAgICAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShhc0FycmF5KGJhc2UpLT5nZXRJbmRleChpbmRleCkpOwpAQCAtMjgwLDcg KzI3OCw3IEBAIHN0YXRpYyBpbmxpbmUgRW5jb2RlZEpTVmFsdWUgZ2V0QnlWYWwoRXhlY1N0YXRl KiBleGVjLCBKU0NlbGwqIGJhc2UsIHVpbnQzMl90IGluCiAgICAgICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoYXNTdHJpbmcoYmFzZSktPmdldEluZGV4KGV4ZWMsIGluZGV4KSk7CiAKICAgICAv LyBGSVhNRTogdGhlIEpJVHN0dWIgdXNlZCB0byByZWxpbmsgdGhpcyB0byBhbiBvcHRpbWl6ZWQg Zm9ybSEKLSAgICBpZiAoaXNKU0J5dGVBcnJheShnbG9iYWxEYXRhLCBiYXNlKSAmJiBhc0J5dGVB cnJheShiYXNlKS0+Y2FuQWNjZXNzSW5kZXgoaW5kZXgpKQorICAgIGlmIChpc0pTQnl0ZUFycmF5 KGJhc2UpICYmIGFzQnl0ZUFycmF5KGJhc2UpLT5jYW5BY2Nlc3NJbmRleChpbmRleCkpCiAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoYXNCeXRlQXJyYXkoYmFzZSktPmdldEluZGV4KGV4 ZWMsIGluZGV4KSk7CiAKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKEpTVmFsdWUoYmFzZSku Z2V0KGV4ZWMsIGluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1NwZWN1bGF0aXZlSklULmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Bl Y3VsYXRpdmVKSVQuY3BwCmluZGV4IGM5ODI4M2EuLmNkMmYwODMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCkBAIC0xMDY5LDcgKzEwNjks NyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjaGVja0FyZ3VtZW50VHlwZXMoKQogICAgICAgICAg ICAgR1BSVGVtcG9yYXJ5IHRlbXAodGhpcyk7CiAgICAgICAgICAgICBtX2ppdC5sb2FkUHRyKEpJ VENvbXBpbGVyOjphZGRyZXNzRm9yKHZpcnR1YWxSZWdpc3RlciksIHRlbXAuZ3ByKCkpOwogICAg ICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncygpLCBOb05vZGUsIG1faml0LmJy YW5jaFRlc3RQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vblplcm8sIHRlbXAuZ3ByKCksIEdQUkluZm86 OnRhZ01hc2tSZWdpc3RlcikpOwotICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVl UmVncygpLCBOb05vZGUsIG1faml0LmJyYW5jaFB0cihNYWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWws IE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHRlbXAuZ3ByKCkpLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1 c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRhKCktPmpzQnl0ZUFycmF5VlB0cikpKTsKKyAgICAg ICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soSlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBtX2ppdC5icmFu Y2hQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyh0 ZW1wLmdwcigpLCBKU0NlbGw6OmNsYXNzSW5mb09mZnNldCgpKSwgTWFjcm9Bc3NlbWJsZXI6OlRy dXN0ZWRJbW1QdHIoJkpTQnl0ZUFycmF5OjpzX2luZm8pKSk7CiAgICAgICAgIH0gZWxzZSBpZiAo aXNCb29sZWFuUHJlZGljdGlvbihwcmVkaWN0ZWRUeXBlKSkgewogICAgICAgICAgICAgR1BSVGVt cG9yYXJ5IHRlbXAodGhpcyk7CiAgICAgICAgICAgICBtX2ppdC5sb2FkUHRyKEpJVENvbXBpbGVy OjphZGRyZXNzRm9yKHZpcnR1YWxSZWdpc3RlciksIHRlbXAuZ3ByKCkpOwpAQCAtMTEzMCw3ICsx MTMwLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y2hlY2tBcmd1bWVudFR5cGVzKCkKICAgICAg ICAgICAgIG1faml0LmxvYWQzMihKSVRDb21waWxlcjo6dGFnRm9yKHZpcnR1YWxSZWdpc3Rlciks IHRlbXAuZ3ByKCkpOwogICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncygp LCBOb05vZGUsIG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgdGVtcC5n cHIoKSwgVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkNlbGxUYWcpKSk7CiAgICAgICAgICAgICBtX2pp dC5sb2FkMzIoSklUQ29tcGlsZXI6OnBheWxvYWRGb3IodmlydHVhbFJlZ2lzdGVyKSwgdGVtcC5n cHIoKSk7Ci0gICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEpTVmFsdWVSZWdzKCksIE5vTm9k ZSwgbV9qaXQuYnJhbmNoUHRyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJs ZXI6OkFkZHJlc3ModGVtcC5ncHIoKSksIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1f aml0Lmdsb2JhbERhdGEoKS0+anNCeXRlQXJyYXlWUHRyKSkpOworICAgICAgICAgICAgc3BlY3Vs YXRpb25DaGVjayhKU1ZhbHVlUmVncygpLCBOb05vZGUsIG1faml0LmJyYW5jaFB0cihNYWNyb0Fz c2VtYmxlcjo6Tm90RXF1YWwsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHRlbXAuZ3ByKCksIEpT Q2VsbDo6Y2xhc3NJbmZvT2Zmc2V0KCkpLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cigm SlNCeXRlQXJyYXk6OnNfaW5mbykpKTsKICAgICAgICAgfSBlbHNlIGlmIChpc0Jvb2xlYW5QcmVk aWN0aW9uKHByZWRpY3RlZFR5cGUpKQogICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1Zh bHVlUmVncygpLCBOb05vZGUsIG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVh bCwgSklUQ29tcGlsZXI6OnRhZ0Zvcih2aXJ0dWFsUmVnaXN0ZXIpLCBUcnVzdGVkSW1tMzIoSlNW YWx1ZTo6Qm9vbGVhblRhZykpKTsKICAgICAgICAgZWxzZSBpZiAoaXNJbnQ4QXJyYXlQcmVkaWN0 aW9uKHByZWRpY3RlZFR5cGUpKSB7CkBAIC0xNDk1LDcgKzE0OTUsNyBAQCB2b2lkIFNwZWN1bGF0 aXZlSklUOjpjb21waWxlUHV0QnlWYWxGb3JCeXRlQXJyYXkoR1BSUmVnIGJhc2UsIEdQUlJlZyBw cm9wZXJ0eSwgTgogICAgIE5vZGVJbmRleCB2YWx1ZUluZGV4ID0gbm9kZS5jaGlsZDMoKTsKICAg ICAKICAgICBpZiAoIWlzQnl0ZUFycmF5UHJlZGljdGlvbihtX3N0YXRlLmZvck5vZGUoYmFzZUlu ZGV4KS5tX3R5cGUpKQotICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEpTVmFsdWVTb3VyY2U6OnVu Ym94ZWRDZWxsKGJhc2UpLCBiYXNlSW5kZXgsIG1faml0LmJyYW5jaFB0cihNYWNyb0Fzc2VtYmxl cjo6Tm90RXF1YWwsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGJhc2UpLCBNYWNyb0Fzc2VtYmxl cjo6VHJ1c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRhKCktPmpzQnl0ZUFycmF5VlB0cikpKTsK KyAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChiYXNl KSwgYmFzZUluZGV4LCBtX2ppdC5icmFuY2hQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBN YWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlLCBKU0NlbGw6OmNsYXNzSW5mb09mZnNldCgpKSwg TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJkpTQnl0ZUFycmF5OjpzX2luZm8pKSk7CiAg ICAgR1BSVGVtcG9yYXJ5IHZhbHVlOwogICAgIEdQUlJlZyB2YWx1ZUdQUjsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKaW5kZXggZjc4 NmI0NS4uMzY3NDBjMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVDY0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklUNjQuY3BwCkBAIC0yMTIwLDcgKzIxMjAsNyBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFu ZCBjZWxsKHRoaXMsIG5vZGUuY2hpbGQxKCkpOwogICAgICAgICAgICAgR1BSUmVnIGNlbGxHUFIg PSBjZWxsLmdwcigpOwogICAgICAgICAgICAgaWYgKCFpc0J5dGVBcnJheVByZWRpY3Rpb24obV9z dGF0ZS5mb3JOb2RlKG5vZGUuY2hpbGQxKCkpLm1fdHlwZSkpCi0gICAgICAgICAgICAgICAgc3Bl Y3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncyhjZWxsR1BSKSwgbm9kZS5jaGlsZDEoKSwgbV9qaXQu YnJhbmNoUHRyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3MoY2VsbEdQUiksIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0Lmdsb2JhbERh dGEoKS0+anNCeXRlQXJyYXlWUHRyKSkpOworICAgICAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hl Y2soSlNWYWx1ZVJlZ3MoY2VsbEdQUiksIG5vZGUuY2hpbGQxKCksIG1faml0LmJyYW5jaFB0cihN YWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWwsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGNlbGxHUFIs IEpTQ2VsbDo6Y2xhc3NJbmZvT2Zmc2V0KCkpLCBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0 cigmSlNCeXRlQXJyYXk6OnNfaW5mbykpKTsKICAgICAgICAgICAgIG1faml0LnN0b3JlUHRyKGNl bGxHUFIsIEpJVENvbXBpbGVyOjphZGRyZXNzRm9yKG5vZGUubG9jYWwoKSkpOwogICAgICAgICAg ICAgbm9SZXN1bHQobV9jb21waWxlSW5kZXgpOwogICAgICAgICB9IGVsc2UgaWYgKGlzQm9vbGVh blByZWRpY3Rpb24ocHJlZGljdGVkVHlwZSkpIHsKQEAgLTM0ODEsNyArMzQ4MSw3IEBAIHZvaWQg U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAgICAgR1BSUmVnIHJlc3Vs dEdQUiA9IHJlc3VsdC5ncHIoKTsKICAgICAgICAgCiAgICAgICAgIGlmICghaXNCeXRlQXJyYXlQ cmVkaWN0aW9uKG1fc3RhdGUuZm9yTm9kZShub2RlLmNoaWxkMSgpKS5tX3R5cGUpKQotICAgICAg ICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncyhiYXNlR1BSKSwgbm9kZS5jaGlsZDEo KSwgbV9qaXQuYnJhbmNoUHRyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJs ZXI6OkFkZHJlc3MoYmFzZUdQUiksIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKG1faml0 Lmdsb2JhbERhdGEoKS0+anNCeXRlQXJyYXlWUHRyKSkpOworICAgICAgICAgICAgc3BlY3VsYXRp b25DaGVjayhKU1ZhbHVlUmVncyhiYXNlR1BSKSwgbm9kZS5jaGlsZDEoKSwgbV9qaXQuYnJhbmNo UHRyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYmFz ZUdQUiwgSlNDZWxsOjpjbGFzc0luZm9PZmZzZXQoKSksIE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVk SW1tUHRyKCZKU0J5dGVBcnJheTo6c19pbmZvKSkpOwogICAgICAgICAKICAgICAgICAgbV9qaXQu bG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlR1BSLCBKU0J5dGVBcnJheTo6b2Zm c2V0T2ZTdG9yYWdlKCkpLCByZXN1bHRHUFIpOwogICAgICAgICBtX2ppdC5sb2FkMzIoTWFjcm9B c3NlbWJsZXI6OkFkZHJlc3MoYmFzZUdQUiwgQnl0ZUFycmF5OjpvZmZzZXRPZlNpemUoKSksIHJl c3VsdEdQUik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJz LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCmluZGV4IGE1MjNm MGMuLjllYjM4ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1 YnMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCkBAIC0y NDc4LDcgKzI0NzgsNiBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVkSlNWYWx1ZSwgb3Bf Z2V0X2J5X3ZhbCkKICAgICBTVFVCX0lOSVRfU1RBQ0tfRlJBTUUoc3RhY2tGcmFtZSk7CiAKICAg ICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IHN0YWNrRnJhbWUuY2FsbEZyYW1lOwotICAgIEpTR2xv YmFsRGF0YSogZ2xvYmFsRGF0YSA9IHN0YWNrRnJhbWUuZ2xvYmFsRGF0YTsKIAogICAgIEpTVmFs dWUgYmFzZVZhbHVlID0gc3RhY2tGcmFtZS5hcmdzWzBdLmpzVmFsdWUoKTsKICAgICBKU1ZhbHVl IHN1YnNjcmlwdCA9IHN0YWNrRnJhbWUuYXJnc1sxXS5qc1ZhbHVlKCk7CkBAIC0yNDk4LDcgKzI0 OTcsNyBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVkSlNWYWx1ZSwgb3BfZ2V0X2J5X3Zh bCkKICAgICAgICAgICAgIENIRUNLX0ZPUl9FWENFUFRJT04oKTsKICAgICAgICAgICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKICAgICAgICAgfQotICAgICAgICBpZiAoaXNKU0J5 dGVBcnJheShnbG9iYWxEYXRhLCBiYXNlVmFsdWUpICYmIGFzQnl0ZUFycmF5KGJhc2VWYWx1ZSkt PmNhbkFjY2Vzc0luZGV4KGkpKSB7CisgICAgICAgIGlmIChpc0pTQnl0ZUFycmF5KGJhc2VWYWx1 ZSkgJiYgYXNCeXRlQXJyYXkoYmFzZVZhbHVlKS0+Y2FuQWNjZXNzSW5kZXgoaSkpIHsKICAgICAg ICAgICAgIC8vIEFsbCBmYXN0IGJ5dGUgYXJyYXkgYWNjZXNzZXMgYXJlIHNhZmUgZnJvbSBleGNl cHRpb25zIHNvIHJldHVybiBpbW1lZGlhdGVseSB0byBhdm9pZCBleGNlcHRpb24gY2hlY2tzLgog ICAgICAgICAgICAgY3RpUGF0Y2hDYWxsQnlSZXR1cm5BZGRyZXNzKGNhbGxGcmFtZS0+Y29kZUJs b2NrKCksIFNUVUJfUkVUVVJOX0FERFJFU1MsIEZ1bmN0aW9uUHRyKGN0aV9vcF9nZXRfYnlfdmFs X2J5dGVfYXJyYXkpKTsKICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoYXNCeXRl QXJyYXkoYmFzZVZhbHVlKS0+Z2V0SW5kZXgoY2FsbEZyYW1lLCBpKSk7CkBAIC0yNTE5LDcgKzI1 MTgsNiBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVkSlNWYWx1ZSwgb3BfZ2V0X2J5X3Zh bF9zdHJpbmcpCiAgICAgU1RVQl9JTklUX1NUQUNLX0ZSQU1FKHN0YWNrRnJhbWUpOwogICAgIAog ICAgIENhbGxGcmFtZSogY2FsbEZyYW1lID0gc3RhY2tGcmFtZS5jYWxsRnJhbWU7Ci0gICAgSlNH bG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gc3RhY2tGcmFtZS5nbG9iYWxEYXRhOwogICAgIAogICAg IEpTVmFsdWUgYmFzZVZhbHVlID0gc3RhY2tGcmFtZS5hcmdzWzBdLmpzVmFsdWUoKTsKICAgICBK U1ZhbHVlIHN1YnNjcmlwdCA9IHN0YWNrRnJhbWUuYXJnc1sxXS5qc1ZhbHVlKCk7CkBAIC0yNTU3 LDEzICsyNTU1LDEzIEBAIERFRklORV9TVFVCX0ZVTkNUSU9OKEVuY29kZWRKU1ZhbHVlLCBvcF9n ZXRfYnlfdmFsX2J5dGVfYXJyYXkpCiAKICAgICBpZiAoTElLRUxZKHN1YnNjcmlwdC5pc1VJbnQz MigpKSkgewogICAgICAgICB1aW50MzJfdCBpID0gc3Vic2NyaXB0LmFzVUludDMyKCk7Ci0gICAg ICAgIGlmIChpc0pTQnl0ZUFycmF5KGdsb2JhbERhdGEsIGJhc2VWYWx1ZSkgJiYgYXNCeXRlQXJy YXkoYmFzZVZhbHVlKS0+Y2FuQWNjZXNzSW5kZXgoaSkpIHsKKyAgICAgICAgaWYgKGlzSlNCeXRl QXJyYXkoYmFzZVZhbHVlKSAmJiBhc0J5dGVBcnJheShiYXNlVmFsdWUpLT5jYW5BY2Nlc3NJbmRl eChpKSkgewogICAgICAgICAgICAgLy8gQWxsIGZhc3QgYnl0ZSBhcnJheSBhY2Nlc3NlcyBhcmUg c2FmZSBmcm9tIGV4Y2VwdGlvbnMgc28gcmV0dXJuIGltbWVkaWF0ZWx5IHRvIGF2b2lkIGV4Y2Vw dGlvbiBjaGVja3MuCiAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGFzQnl0ZUFy cmF5KGJhc2VWYWx1ZSktPmdldEluZGV4KGNhbGxGcmFtZSwgaSkpOwogICAgICAgICB9CiAKICAg ICAgICAgcmVzdWx0ID0gYmFzZVZhbHVlLmdldChjYWxsRnJhbWUsIGkpOwotICAgICAgICBpZiAo IWlzSlNCeXRlQXJyYXkoZ2xvYmFsRGF0YSwgYmFzZVZhbHVlKSkKKyAgICAgICAgaWYgKCFpc0pT Qnl0ZUFycmF5KGJhc2VWYWx1ZSkpCiAgICAgICAgICAgICBjdGlQYXRjaENhbGxCeVJldHVybkFk ZHJlc3MoY2FsbEZyYW1lLT5jb2RlQmxvY2soKSwgU1RVQl9SRVRVUk5fQUREUkVTUywgRnVuY3Rp b25QdHIoY3RpX29wX2dldF9ieV92YWwpKTsKICAgICB9IGVsc2UgewogICAgICAgICBJZGVudGlm aWVyIHByb3BlcnR5KGNhbGxGcmFtZSwgc3Vic2NyaXB0LnRvU3RyaW5nKGNhbGxGcmFtZSkpOwpA QCAtMjYwOSw3ICsyNjA3LDcgQEAgREVGSU5FX1NUVUJfRlVOQ1RJT04odm9pZCwgb3BfcHV0X2J5 X3ZhbCkKICAgICAgICAgICAgICAgICBqc0FycmF5LT5zZXRJbmRleCgqZ2xvYmFsRGF0YSwgaSwg dmFsdWUpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIEpTQXJyYXk6OnB1dEJ5 SW5kZXgoanNBcnJheSwgY2FsbEZyYW1lLCBpLCB2YWx1ZSk7Ci0gICAgICAgIH0gZWxzZSBpZiAo aXNKU0J5dGVBcnJheShnbG9iYWxEYXRhLCBiYXNlVmFsdWUpICYmIGFzQnl0ZUFycmF5KGJhc2VW YWx1ZSktPmNhbkFjY2Vzc0luZGV4KGkpKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaXNKU0J5dGVB cnJheShiYXNlVmFsdWUpICYmIGFzQnl0ZUFycmF5KGJhc2VWYWx1ZSktPmNhbkFjY2Vzc0luZGV4 KGkpKSB7CiAgICAgICAgICAgICBKU0J5dGVBcnJheSoganNCeXRlQXJyYXkgPSBhc0J5dGVBcnJh eShiYXNlVmFsdWUpOwogICAgICAgICAgICAgY3RpUGF0Y2hDYWxsQnlSZXR1cm5BZGRyZXNzKGNh bGxGcmFtZS0+Y29kZUJsb2NrKCksIFNUVUJfUkVUVVJOX0FERFJFU1MsIEZ1bmN0aW9uUHRyKGN0 aV9vcF9wdXRfYnlfdmFsX2J5dGVfYXJyYXkpKTsKICAgICAgICAgICAgIC8vIEFsbCBmYXN0IGJ5 dGUgYXJyYXkgYWNjZXNzZXMgYXJlIHNhZmUgZnJvbSBleGNlcHRpb25zIHNvIHJldHVybiBpbW1l ZGlhdGVseSB0byBhdm9pZCBleGNlcHRpb24gY2hlY2tzLgpAQCAtMjY0Miw3ICsyNjQwLDYgQEAg REVGSU5FX1NUVUJfRlVOQ1RJT04odm9pZCwgb3BfcHV0X2J5X3ZhbF9ieXRlX2FycmF5KQogICAg IFNUVUJfSU5JVF9TVEFDS19GUkFNRShzdGFja0ZyYW1lKTsKICAgICAKICAgICBDYWxsRnJhbWUq IGNhbGxGcmFtZSA9IHN0YWNrRnJhbWUuY2FsbEZyYW1lOwotICAgIEpTR2xvYmFsRGF0YSogZ2xv YmFsRGF0YSA9IHN0YWNrRnJhbWUuZ2xvYmFsRGF0YTsKICAgICAKICAgICBKU1ZhbHVlIGJhc2VW YWx1ZSA9IHN0YWNrRnJhbWUuYXJnc1swXS5qc1ZhbHVlKCk7CiAgICAgSlNWYWx1ZSBzdWJzY3Jp cHQgPSBzdGFja0ZyYW1lLmFyZ3NbMV0uanNWYWx1ZSgpOwpAQCAtMjY1MCw3ICsyNjQ3LDcgQEAg REVGSU5FX1NUVUJfRlVOQ1RJT04odm9pZCwgb3BfcHV0X2J5X3ZhbF9ieXRlX2FycmF5KQogICAg IAogICAgIGlmIChMSUtFTFkoc3Vic2NyaXB0LmlzVUludDMyKCkpKSB7CiAgICAgICAgIHVpbnQz Ml90IGkgPSBzdWJzY3JpcHQuYXNVSW50MzIoKTsKLSAgICAgICAgaWYgKGlzSlNCeXRlQXJyYXko Z2xvYmFsRGF0YSwgYmFzZVZhbHVlKSAmJiBhc0J5dGVBcnJheShiYXNlVmFsdWUpLT5jYW5BY2Nl c3NJbmRleChpKSkgeworICAgICAgICBpZiAoaXNKU0J5dGVBcnJheShiYXNlVmFsdWUpICYmIGFz Qnl0ZUFycmF5KGJhc2VWYWx1ZSktPmNhbkFjY2Vzc0luZGV4KGkpKSB7CiAgICAgICAgICAgICBK U0J5dGVBcnJheSoganNCeXRlQXJyYXkgPSBhc0J5dGVBcnJheShiYXNlVmFsdWUpOwogICAgICAg ICAgICAgCiAgICAgICAgICAgICAvLyBBbGwgZmFzdCBieXRlIGFycmF5IGFjY2Vzc2VzIGFyZSBz YWZlIGZyb20gZXhjZXB0aW9ucyBzbyByZXR1cm4gaW1tZWRpYXRlbHkgdG8gYXZvaWQgZXhjZXB0 aW9uIGNoZWNrcy4KQEAgLTI2NjUsNyArMjY2Miw3IEBAIERFRklORV9TVFVCX0ZVTkNUSU9OKHZv aWQsIG9wX3B1dF9ieV92YWxfYnl0ZV9hcnJheSkKICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgIGlmICghaXNKU0J5dGVBcnJheShnbG9iYWxEYXRhLCBiYXNlVmFsdWUpKQorICAg ICAgICBpZiAoIWlzSlNCeXRlQXJyYXkoYmFzZVZhbHVlKSkKICAgICAgICAgICAgIGN0aVBhdGNo Q2FsbEJ5UmV0dXJuQWRkcmVzcyhjYWxsRnJhbWUtPmNvZGVCbG9jaygpLCBTVFVCX1JFVFVSTl9B RERSRVNTLCBGdW5jdGlvblB0cihjdGlfb3BfcHV0X2J5X3ZhbCkpOwogICAgICAgICBiYXNlVmFs dWUucHV0KGNhbGxGcmFtZSwgaSwgdmFsdWUpOwogICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0J5dGVBcnJheS5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0J5dGVBcnJheS5jcHAKaW5kZXggOTk3M2M1Ni4uYWI5YTIy MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNCeXRlQXJyYXku Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQnl0ZUFycmF5LmNwcApA QCAtNDQsNyArNDQsNyBAQCBKU0J5dGVBcnJheTo6SlNCeXRlQXJyYXkoRXhlY1N0YXRlKiBleGVj LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgQnl0ZUFycmF5KiBzdG9yYQogI2lmICFBU1NFUlRfRElT QUJMRUQKIEpTQnl0ZUFycmF5Ojp+SlNCeXRlQXJyYXkoKQogewotICAgIEFTU0VSVCh2cHRyKCkg PT0gSlNHbG9iYWxEYXRhOjpqc0J5dGVBcnJheVZQdHIpOworICAgIEFTU0VSVCh1bnZhbGlkYXRl ZENsYXNzSW5mbygpLT5pc1N1YkNsYXNzT2YoJkpTQnl0ZUFycmF5OjpzX2luZm8pKTsKIH0KICNl bmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0J5dGVB cnJheS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNCeXRlQXJyYXkuaAppbmRl eCAwMDQxZDE0Li43MTQ2YjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0J5dGVBcnJheS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT Qnl0ZUFycmF5LmgKQEAgLTEzMiw3ICsxMzIsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAg cmV0dXJuIHN0YXRpY19jYXN0PEpTQnl0ZUFycmF5Kj4odmFsdWUuYXNDZWxsKCkpOwogICAgIH0K IAotICAgIGlubGluZSBib29sIGlzSlNCeXRlQXJyYXkoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRh LCBKU1ZhbHVlIHYpIHsgcmV0dXJuIHYuaXNDZWxsKCkgJiYgdi5hc0NlbGwoKS0+dnB0cigpID09 IGdsb2JhbERhdGEtPmpzQnl0ZUFycmF5VlB0cjsgfQorICAgIGlubGluZSBib29sIGlzSlNCeXRl QXJyYXkoSlNWYWx1ZSB2KSB7IHJldHVybiB2LmlzQ2VsbCgpICYmIHYuYXNDZWxsKCktPmNsYXNz SW5mbygpID09ICZKU0J5dGVBcnJheTo6c19pbmZvOyB9CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmNwcAppbmRl eCAwOGE1YTk0Li41ODY1NmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0dsb2JhbERhdGEuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTR2xvYmFsRGF0YS5jcHAKQEAgLTExMSw3ICsxMTEsNiBAQCBleHRlcm4gY29uc3QgSGFzaFRh YmxlIHN0cmluZ0NvbnN0cnVjdG9yVGFibGU7CiAKIHZvaWQqIEpTR2xvYmFsRGF0YTo6anNGaW5h bE9iamVjdFZQdHI7CiB2b2lkKiBKU0dsb2JhbERhdGE6OmpzQXJyYXlWUHRyOwotdm9pZCogSlNH bG9iYWxEYXRhOjpqc0J5dGVBcnJheVZQdHI7CiB2b2lkKiBKU0dsb2JhbERhdGE6OmpzRnVuY3Rp b25WUHRyOwogCiAjaWYgQ09NUElMRVIoR0NDKQpAQCAtMTM5LDExICsxMzgsNiBAQCB2b2lkIEpT R2xvYmFsRGF0YTo6c3RvcmVWUHRycygpCiAgICAgQ0xPQkJFUl9NRU1PUlkoKTsKICAgICBKU0ds b2JhbERhdGE6OmpzQXJyYXlWUHRyID0ganNBcnJheS0+dnB0cigpOwogCi0gICAgQ09NUElMRV9B U1NFUlQoc2l6ZW9mKEpTQnl0ZUFycmF5KSA8PSBzaXplb2Yoc3RvcmFnZSksIHNpemVvZl9KU0J5 dGVBcnJheV9tdXN0X2JlX2xlc3NfdGhhbl9zdG9yYWdlKTsKLSAgICBKU0NlbGwqIGpzQnl0ZUFy cmF5ID0gbmV3IChzdG9yYWdlKSBKU0J5dGVBcnJheShKU0J5dGVBcnJheTo6VlB0clN0ZWFsaW5n SGFjayk7Ci0gICAgQ0xPQkJFUl9NRU1PUlkoKTsKLSAgICBKU0dsb2JhbERhdGE6OmpzQnl0ZUFy cmF5VlB0ciA9IGpzQnl0ZUFycmF5LT52cHRyKCk7Ci0KICAgICBDT01QSUxFX0FTU0VSVChzaXpl b2YoSlNGdW5jdGlvbikgPD0gc2l6ZW9mKHN0b3JhZ2UpLCBzaXplb2ZfSlNGdW5jdGlvbl9tdXN0 X2JlX2xlc3NfdGhhbl9zdG9yYWdlKTsKICAgICBKU0NlbGwqIGpzRnVuY3Rpb24gPSBuZXcgKHN0 b3JhZ2UpIEpTRnVuY3Rpb24oSlNDZWxsOjpWUHRyU3RlYWxpbmdIYWNrKTsKICAgICBDTE9CQkVS X01FTU9SWSgpOwpAQCAtMTUyLDExICsxNDYsOCBAQCB2b2lkIEpTR2xvYmFsRGF0YTo6c3RvcmVW UHRycygpCiAgICAgLy8gVW50aWwgd2UgZnVsbHkgcmVtb3ZlIG91ciByZWxpYW5jZSBvbiB2cHRy cywgd2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCBldmVyeWJvZHkgdGhhdCAKICAgICAvLyB3ZSB0 aGluayBoYXMgYSB1bmlxdWUgdmlydHVhbCBwb2ludGVyIGFjdHVhbGx5IGRvZXMuCiAgICAgaWYg KGpzRmluYWxPYmplY3RWUHRyID09IGpzQXJyYXlWUHRyCi0gICAgICAgIHx8IGpzRmluYWxPYmpl Y3RWUHRyID09IGpzQnl0ZUFycmF5VlB0cgogICAgICAgICB8fCBqc0ZpbmFsT2JqZWN0VlB0ciA9 PSBqc0Z1bmN0aW9uVlB0cgotICAgICAgICB8fCBqc0FycmF5VlB0ciA9PSBqc0J5dGVBcnJheVZQ dHIKLSAgICAgICAgfHwganNBcnJheVZQdHIgPT0ganNGdW5jdGlvblZQdHIKLSAgICAgICAgfHwg anNCeXRlQXJyYXlWUHRyID09IGpzRnVuY3Rpb25WUHRyKQorICAgICAgICB8fCBqc0FycmF5VlB0 ciA9PSBqc0Z1bmN0aW9uVlB0cikKICAgICAgICAgQ1JBU0goKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuaAppbmRleCBiZWUzZDY4Li44OTlmMDIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEu aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuaApAQCAt MTk2LDcgKzE5Niw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBzdGF0aWMgdm9pZCBzdG9y ZVZQdHJzKCk7CiAgICAgICAgIHN0YXRpYyBKU19FWFBPUlREQVRBIHZvaWQqIGpzRmluYWxPYmpl Y3RWUHRyOwogICAgICAgICBzdGF0aWMgSlNfRVhQT1JUREFUQSB2b2lkKiBqc0FycmF5VlB0cjsK LSAgICAgICAgc3RhdGljIEpTX0VYUE9SVERBVEEgdm9pZCoganNCeXRlQXJyYXlWUHRyOwogICAg ICAgICBzdGF0aWMgSlNfRVhQT1JUREFUQSB2b2lkKiBqc0Z1bmN0aW9uVlB0cjsKIAogICAgICAg ICBJZGVudGlmaWVyVGFibGUqIGlkZW50aWZpZXJUYWJsZTsKLS0gCjEuNy40LjQKCg==