148397 2015-08-24 14:38:07 -0700 DFG::FixupPhase should use the lambda form of m_graph.doToChildren() rather than the old macro 2015-08-24 14:45:13 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other All All RESOLVED FIXED P2 Normal --- 145204 1 fpizlo fpizlo barraclough basile_clement benjamin commit-queue ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1120387 0 fpizlo 2015-08-24 14:38:07 -0700 Patch forthcoming. 1120394 1 259777 fpizlo 2015-08-24 14:40:12 -0700 Created attachment 259777 the patch 1120399 2 259777 ggaren 2015-08-24 14:41:52 -0700 Comment on attachment 259777 the patch r=me 1120405 3 commit-queue 2015-08-24 14:43:28 -0700 Attachment 259777 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:2123: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:2176: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1120411 4 fpizlo 2015-08-24 14:45:13 -0700 Landed in http://trac.webkit.org/changeset/188886 259777 2015-08-24 14:40:12 -0700 2015-08-24 14:41:52 -0700 the patch blah.patch text/plain 14607 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4ODgxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE1LTA4LTI0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpGaXh1cFBoYXNlIHNob3VsZCB1c2UgdGhlIGxhbWJkYSBmb3JtIG9mIG1fZ3JhcGguZG9U b0NoaWxkcmVuKCkgcmF0aGVyIHRoYW4gdGhlIG9sZCBtYWNybworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4Mzk3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgdXNlZCB0byBpdGVyYXRlIHRoZSBlZGdl cyBvZiBhIG5vZGUgYnkgdXNpbmcgdGhlIERGR19OT0RFX0RPX1RPX0NISUxEUkVOIG1hY3JvLiBX ZQorICAgICAgICBkb24ndCBuZWVkIHRvIGRvIHRoYXQgYW55bW9yZSBzaW5jZSB3ZSBoYXZlIHRo ZSBsYW1iZGEtYmFzZWQgbV9ncmFwaC5kb1RvQ2hpbGRyZW4oKS4gVGhpcworICAgICAgICBhbGxv d3MgdXMgdG8gZ2V0IHJpZCBvZiBhIGJ1bmNoIG9mIGhlbHBlciBtZXRob2RzIGluIERGRzo6Rml4 dXBQaGFzZS4KKworICAgICAgICBJIGFsc28gdG9vayB0aGUgb3Bwb3J0dW5pdHkgdG8gZ2l2ZSB0 aGUgaW5qZWN0VHlwZUNvbnZlcnNpb25zSW5CbG9jaygpIG1ldGhvZCBhIG1vcmUKKyAgICAgICAg Z2VuZXJpYyBuYW1lLCBzaW5jZSBhZnRlciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ1MjA0IGl0IHdpbGwgYmUgdXNlZAorICAgICAgICBmb3IgZml4LXVwIG9mIGNo ZWNrcyBtb3JlIGJyb2FkbHkuCisKKyAgICAgICAgKiBkZmcvREZHRml4dXBQaGFzZS5jcHA6Cisg ICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6cnVuKToKKyAgICAgICAgKEpTQzo6REZHOjpG aXh1cFBoYXNlOjphdHRlbXB0VG9NYWtlR2V0VHlwZWRBcnJheUJ5dGVPZmZzZXQpOgorICAgICAg ICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwQ2hlY2tzSW5CbG9jayk6CisgICAgICAgIChK U0M6OkRGRzo6Rml4dXBQaGFzZTo6aW5qZWN0VHlwZUNvbnZlcnNpb25zSW5CbG9jayk6IERlbGV0 ZWQuCisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6dHJ5VG9SZWxheFJlcHJlc2VudGF0 aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXhFZGdlUmVw cmVzZW50YXRpb24pOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6Omlu amVjdFR5cGVDb252ZXJzaW9uc0ZvckVkZ2UpOiBEZWxldGVkLgorCiAyMDE1LTA4LTIyICBGaWxp cCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZHOjpJbnNlcnRpb25TZXQg c2hvdWxkIGJlIHRvbGVyYW50IG9mIG9jY2FzaW9uYWwgb3V0LW9mLW9yZGVyIGluc2VydGlvbnMK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAkocmV2 aXNpb24gMTg4ODc4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcsNyArNjcsNyBAQCBwdWJsaWM6CiAgICAgICAgIH0K ICAgICAgICAgCiAgICAgICAgIGZvciAoQmxvY2tJbmRleCBibG9ja0luZGV4ID0gMDsgYmxvY2tJ bmRleCA8IG1fZ3JhcGgubnVtQmxvY2tzKCk7ICsrYmxvY2tJbmRleCkKLSAgICAgICAgICAgIGlu amVjdFR5cGVDb252ZXJzaW9uc0luQmxvY2sobV9ncmFwaC5ibG9jayhibG9ja0luZGV4KSk7Cisg ICAgICAgICAgICBmaXh1cENoZWNrc0luQmxvY2sobV9ncmFwaC5ibG9jayhibG9ja0luZGV4KSk7 CiAKICAgICAgICAgbV9ncmFwaC5tX3BsYW5TdGFnZSA9IFBsYW5TdGFnZTo6QWZ0ZXJGaXh1cDsK IApAQCAtMjEwNCwxNjYgKzIxMDQsMTU0IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KICAgICAKLSAgICB2b2lkIGluamVjdFR5cGVDb252ZXJzaW9uc0luQmxvY2soQmFz aWNCbG9jayogYmxvY2spCisgICAgdm9pZCBmaXh1cENoZWNrc0luQmxvY2soQmFzaWNCbG9jayog YmxvY2spCiAgICAgewogICAgICAgICBpZiAoIWJsb2NrKQogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBBU1NFUlQoYmxvY2stPmlzUmVhY2hhYmxlKTsKICAgICAgICAgbV9ibG9jayA9IGJs b2NrOwogICAgICAgICBmb3IgKG1faW5kZXhJbkJsb2NrID0gMDsgbV9pbmRleEluQmxvY2sgPCBi bG9jay0+c2l6ZSgpOyArK21faW5kZXhJbkJsb2NrKSB7Ci0gICAgICAgICAgICBtX2N1cnJlbnRO b2RlID0gYmxvY2stPmF0KG1faW5kZXhJbkJsb2NrKTsKLSAgICAgICAgICAgIHRyeVRvUmVsYXhS ZXByZXNlbnRhdGlvbihtX2N1cnJlbnROb2RlKTsKLSAgICAgICAgICAgIERGR19OT0RFX0RPX1RP X0NISUxEUkVOKG1fZ3JhcGgsIG1fY3VycmVudE5vZGUsIGluamVjdFR5cGVDb252ZXJzaW9uc0Zv ckVkZ2UpOwotICAgICAgICB9Ci0gICAgICAgIG1faW5zZXJ0aW9uU2V0LmV4ZWN1dGUoYmxvY2sp OwotICAgIH0KLSAgICAKLSAgICB2b2lkIHRyeVRvUmVsYXhSZXByZXNlbnRhdGlvbihOb2RlKiBu b2RlKQotICAgIHsKLSAgICAgICAgLy8gU29tZSBvcGVyYXRpb25zIG1heSBiZSBhYmxlIHRvIG9w ZXJhdGUgbW9yZSBlZmZpY2llbnRseSBvdmVyIGxvb3NlciByZXByZXNlbnRhdGlvbnMuCi0gICAg ICAgIC8vIElkZW50aWZ5IHRob3NlIGhlcmUuIFRoaXMgYXZvaWRzIGluc2VydGluZyBhIHJlZHVu ZGFudCByZXByZXNlbnRhdGlvbiBjb252ZXJzaW9uLgotICAgICAgICAvLyBBbHNvLCBmb3Igc29t ZSBvcGVyYXRpb25zLCBsaWtlIE1vdkhpbnQsIHRoaXMgaXMgYSBuZWNlc3Nhcnkgb3B0aW1pemF0 aW9uOiBpbnNlcnRpbmcKLSAgICAgICAgLy8gYW4gb3RoZXJ3aXNlLWRlYWQgY29udmVyc2lvbiBq dXN0IGZvciBhIE1vdkhpbnQgd291bGQgYnJlYWsgT1NSJ3MgdW5kZXJzdGFuZGluZyBvZgotICAg ICAgICAvLyB0aGUgSVIuCi0gICAgICAgIAotICAgICAgICBzd2l0Y2ggKG5vZGUtPm9wKCkpIHsK LSAgICAgICAgY2FzZSBNb3ZIaW50OgotICAgICAgICBjYXNlIENoZWNrOgotICAgICAgICAgICAg REZHX05PREVfRE9fVE9fQ0hJTERSRU4obV9ncmFwaCwgbV9jdXJyZW50Tm9kZSwgZml4RWRnZVJl cHJlc2VudGF0aW9uKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgCi0gICAgICAg IGNhc2UgVmFsdWVUb0ludDMyOgotICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLnVzZUtp bmQoKSA9PSBEb3VibGVSZXBVc2UKLSAgICAgICAgICAgICAgICAmJiAhbm9kZS0+Y2hpbGQxKCkt Pmhhc0RvdWJsZVJlc3VsdCgpKSB7Ci0gICAgICAgICAgICAgICAgbm9kZS0+Y2hpbGQxKCkuc2V0 VXNlS2luZChOdW1iZXJVc2UpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAKLSAgICAgICAgZGVmYXVsdDoKLSAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotICAgIAotICAgIHZvaWQgZml4RWRn ZVJlcHJlc2VudGF0aW9uKE5vZGUqLCBFZGdlJiBlZGdlKQotICAgIHsKLSAgICAgICAgc3dpdGNo IChlZGdlLnVzZUtpbmQoKSkgewotICAgICAgICBjYXNlIERvdWJsZVJlcFVzZToKLSAgICAgICAg Y2FzZSBEb3VibGVSZXBSZWFsVXNlOgotICAgICAgICAgICAgaWYgKGVkZ2UtPmhhc0RvdWJsZVJl c3VsdCgpKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgCi0gICAgICAgICAg ICBpZiAoZWRnZS0+aGFzSW50NTJSZXN1bHQoKSkKLSAgICAgICAgICAgICAgICBlZGdlLnNldFVz ZUtpbmQoSW50NTJSZXBVc2UpOwotICAgICAgICAgICAgZWxzZSBpZiAoZWRnZS51c2VLaW5kKCkg PT0gRG91YmxlUmVwVXNlKQotICAgICAgICAgICAgICAgIGVkZ2Uuc2V0VXNlS2luZChOdW1iZXJV c2UpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBOb2RlKiBub2RlID0gYmxvY2st PmF0KG1faW5kZXhJbkJsb2NrKTsKKworICAgICAgICAgICAgLy8gRmlyc3QsIHRyeSB0byByZWxh eCB0aGUgcmVwcmVzZW50YXRpb25hbCBkZW1hbmRzIG9mIGVhY2ggbm9kZSwgaW4gb3JkZXIgdG8g aGF2ZQorICAgICAgICAgICAgLy8gZmV3ZXIgY29udmVyc2lvbnMuCisgICAgICAgICAgICBzd2l0 Y2ggKG5vZGUtPm9wKCkpIHsKKyAgICAgICAgICAgIGNhc2UgTW92SGludDoKKyAgICAgICAgICAg IGNhc2UgQ2hlY2s6CisgICAgICAgICAgICAgICAgbV9ncmFwaC5kb1RvQ2hpbGRyZW4oCisgICAg ICAgICAgICAgICAgICAgIG5vZGUsCisgICAgICAgICAgICAgICAgICAgIFsmXSAoRWRnZSYgZWRn ZSkgeworICAgICAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChlZGdlLnVzZUtpbmQoKSkgewor ICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBEb3VibGVSZXBVc2U6CisgICAgICAgICAgICAg ICAgICAgICAgICBjYXNlIERvdWJsZVJlcFJlYWxVc2U6CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKGVkZ2UtPmhhc0RvdWJsZVJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmIChlZGdlLT5oYXNJbnQ1MlJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlZGdlLnNldFVzZUtpbmQoSW50NTJSZXBVc2UpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGVsc2UgaWYgKGVkZ2UudXNlS2luZCgpID09IERvdWJsZVJlcFVzZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZWRnZS5zZXRVc2VLaW5kKE51bWJlclVzZSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAKLSAgICAgICAg Y2FzZSBJbnQ1MlJlcFVzZToKLSAgICAgICAgICAgIC8vIE5vdGhpbmcgd2UgY2FuIHJlYWxseSBk by4KLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBJbnQ1 MlJlcFVzZToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBOb3RoaW5nIHdlIGNhbiBy ZWFsbHkgZG8uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICAKLSAgICAgICAgY2FzZSBVbnR5cGVkVXNlOgotICAgICAgICBjYXNlIE51bWJlclVzZToKLSAg ICAgICAgICAgIGlmIChlZGdlLT5oYXNEb3VibGVSZXN1bHQoKSkKLSAgICAgICAgICAgICAgICBl ZGdlLnNldFVzZUtpbmQoRG91YmxlUmVwVXNlKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGVkZ2Ut Pmhhc0ludDUyUmVzdWx0KCkpCi0gICAgICAgICAgICAgICAgZWRnZS5zZXRVc2VLaW5kKEludDUy UmVwVXNlKTsKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSBVbnR5cGVkVXNlOgorICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBOdW1iZXJVc2U6Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVkZ2UtPmhhc0RvdWJsZVJlc3VsdCgpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlZGdlLnNldFVzZUtpbmQoRG91YmxlUmVw VXNlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChlZGdlLT5oYXNJbnQ1 MlJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlZGdlLnNldFVzZUtp bmQoSW50NTJSZXBVc2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgCi0gICAgICAgIGNhc2UgUmVhbE51bWJlclVzZToKLSAgICAgICAgICAgIGlmIChl ZGdlLT5oYXNEb3VibGVSZXN1bHQoKSkKLSAgICAgICAgICAgICAgICBlZGdlLnNldFVzZUtpbmQo RG91YmxlUmVwUmVhbFVzZSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChlZGdlLT5oYXNJbnQ1MlJl c3VsdCgpKQotICAgICAgICAgICAgICAgIGVkZ2Uuc2V0VXNlS2luZChJbnQ1MlJlcFVzZSk7Ci0g ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgUmVhbE51bWJl clVzZToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZWRnZS0+aGFzRG91YmxlUmVz dWx0KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVkZ2Uuc2V0VXNlS2luZChE b3VibGVSZXBSZWFsVXNlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChl ZGdlLT5oYXNJbnQ1MlJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBl ZGdlLnNldFVzZUtpbmQoSW50NTJSZXBVc2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICAgICAgCi0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBicmVh azsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICB2b2lkIGluamVjdFR5cGVDb252ZXJzaW9u c0ZvckVkZ2UoTm9kZSogbm9kZSwgRWRnZSYgZWRnZSkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChu b2RlID09IG1fY3VycmVudE5vZGUpOwotICAgICAgICBOb2RlKiByZXN1bHQgPSBudWxscHRyOwot ICAgICAgICAKLSAgICAgICAgc3dpdGNoIChlZGdlLnVzZUtpbmQoKSkgewotICAgICAgICBjYXNl IERvdWJsZVJlcFVzZToKLSAgICAgICAgY2FzZSBEb3VibGVSZXBSZWFsVXNlOgotICAgICAgICBj YXNlIERvdWJsZVJlcE1hY2hpbmVJbnRVc2U6IHsKLSAgICAgICAgICAgIGlmIChlZGdlLT5oYXNE b3VibGVSZXN1bHQoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgCi0gICAgICAgICAgICBpZiAoZWRnZS0+aXNOdW1iZXJDb25zdGFudCgpKSB7Ci0gICAgICAg ICAgICAgICAgcmVzdWx0ID0gbV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKLSAgICAgICAgICAg ICAgICAgICAgbV9pbmRleEluQmxvY2ssIFNwZWNCeXRlY29kZURvdWJsZSwgRG91YmxlQ29uc3Rh bnQsIG5vZGUtPm9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgT3BJbmZvKG1fZ3JhcGguZnJl ZXplKGpzRG91YmxlTnVtYmVyKGVkZ2UtPmFzTnVtYmVyKCkpKSkpOwotICAgICAgICAgICAgfSBl bHNlIGlmIChlZGdlLT5oYXNJbnQ1MlJlc3VsdCgpKSB7Ci0gICAgICAgICAgICAgICAgcmVzdWx0 ID0gbV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKLSAgICAgICAgICAgICAgICAgICAgbV9pbmRl eEluQmxvY2ssIFNwZWNJbnQ1MkFzRG91YmxlLCBEb3VibGVSZXAsIG5vZGUtPm9yaWdpbiwKLSAg ICAgICAgICAgICAgICAgICAgRWRnZShlZGdlLm5vZGUoKSwgSW50NTJSZXBVc2UpKTsKLSAgICAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgVXNlS2luZCB1c2VLaW5kOwotICAgICAg ICAgICAgICAgIGlmIChlZGdlLT5zaG91bGRTcGVjdWxhdGVEb3VibGVSZWFsKCkpCi0gICAgICAg ICAgICAgICAgICAgIHVzZUtpbmQgPSBSZWFsTnVtYmVyVXNlOwotICAgICAgICAgICAgICAgIGVs c2UgaWYgKGVkZ2UtPnNob3VsZFNwZWN1bGF0ZU51bWJlcigpKQotICAgICAgICAgICAgICAgICAg ICB1c2VLaW5kID0gTnVtYmVyVXNlOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICAgICAgdXNlS2luZCA9IE5vdENlbGxVc2U7Ci0KLSAgICAgICAgICAgICAgICByZXN1bHQg PSBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKAotICAgICAgICAgICAgICAgICAgICBtX2luZGV4 SW5CbG9jaywgU3BlY0J5dGVjb2RlRG91YmxlLCBEb3VibGVSZXAsIG5vZGUtPm9yaWdpbiwKLSAg ICAgICAgICAgICAgICAgICAgRWRnZShlZGdlLm5vZGUoKSwgdXNlS2luZCkpOwotICAgICAgICAg ICAgfQotCi0gICAgICAgICAgICBlZGdlLnNldE5vZGUocmVzdWx0KTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgY2FzZSBJbnQ1MlJlcFVzZTog ewotICAgICAgICAgICAgaWYgKGVkZ2UtPmhhc0ludDUyUmVzdWx0KCkpCisgICAgICAgICAgICAg ICAgCisgICAgICAgICAgICBjYXNlIFZhbHVlVG9JbnQzMjoKKyAgICAgICAgICAgICAgICBpZiAo bm9kZS0+Y2hpbGQxKCkudXNlS2luZCgpID09IERvdWJsZVJlcFVzZQorICAgICAgICAgICAgICAg ICAgICAmJiAhbm9kZS0+Y2hpbGQxKCktPmhhc0RvdWJsZVJlc3VsdCgpKSB7CisgICAgICAgICAg ICAgICAgICAgIG5vZGUtPmNoaWxkMSgpLnNldFVzZUtpbmQoTnVtYmVyVXNlKTsKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgaWYgKGVkZ2UtPmlzTWFjaGlu ZUludENvbnN0YW50KCkpIHsKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2VydGlvblNl dC5pbnNlcnROb2RlKAotICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY01h Y2hpbmVJbnQsIEludDUyQ29uc3RhbnQsIG5vZGUtPm9yaWdpbiwKLSAgICAgICAgICAgICAgICAg ICAgT3BJbmZvKGVkZ2UtPmNvbnN0YW50KCkpKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZWRn ZS0+aGFzRG91YmxlUmVzdWx0KCkpIHsKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2Vy dGlvblNldC5pbnNlcnROb2RlKAotICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywg U3BlY01hY2hpbmVJbnQsIEludDUyUmVwLCBub2RlLT5vcmlnaW4sCi0gICAgICAgICAgICAgICAg ICAgIEVkZ2UoZWRnZS5ub2RlKCksIERvdWJsZVJlcE1hY2hpbmVJbnRVc2UpKTsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAoZWRnZS0+c2hvdWxkU3BlY3VsYXRlSW50MzJGb3JBcml0aG1ldGljKCkp IHsKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKAot ICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY0ludDMyLCBJbnQ1MlJlcCwg bm9kZS0+b3JpZ2luLAotICAgICAgICAgICAgICAgICAgICBFZGdlKGVkZ2Uubm9kZSgpLCBJbnQz MlVzZSkpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBt X2luc2VydGlvblNldC5pbnNlcnROb2RlKAotICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5C bG9jaywgU3BlY01hY2hpbmVJbnQsIEludDUyUmVwLCBub2RlLT5vcmlnaW4sCi0gICAgICAgICAg ICAgICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIE1hY2hpbmVJbnRVc2UpKTsKICAgICAgICAgICAg IH0KIAotICAgICAgICAgICAgZWRnZS5zZXROb2RlKHJlc3VsdCk7Ci0gICAgICAgICAgICBicmVh azsKLSAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgIGRlZmF1bHQ6IHsKLSAgICAgICAg ICAgIGlmICghZWRnZS0+aGFzRG91YmxlUmVzdWx0KCkgJiYgIWVkZ2UtPmhhc0ludDUyUmVzdWx0 KCkpCi0gICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAvLyBOb3csIGluc2VydCB0 eXBlIGNvbnZlcnNpb25zIGlmIG5lY2Vzc2FyeS4KKyAgICAgICAgICAgIG1fZ3JhcGguZG9Ub0No aWxkcmVuKAorICAgICAgICAgICAgICAgIG5vZGUsCisgICAgICAgICAgICAgICAgWyZdIChFZGdl JiBlZGdlKSB7CisgICAgICAgICAgICAgICAgICAgIE5vZGUqIHJlc3VsdCA9IG51bGxwdHI7Cisg ICAgICAgIAorICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKGVkZ2UudXNlS2luZCgpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGNhc2UgRG91YmxlUmVwVXNlOgorICAgICAgICAgICAgICAgICAg ICBjYXNlIERvdWJsZVJlcFJlYWxVc2U6CisgICAgICAgICAgICAgICAgICAgIGNhc2UgRG91Ymxl UmVwTWFjaGluZUludFVzZTogeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVkZ2UtPmhh c0RvdWJsZVJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgIAorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVkZ2UtPmlzTnVtYmVyQ29u c3RhbnQoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IG1faW5zZXJ0 aW9uU2V0Lmluc2VydE5vZGUoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1faW5k ZXhJbkJsb2NrLCBTcGVjQnl0ZWNvZGVEb3VibGUsIERvdWJsZUNvbnN0YW50LCBub2RlLT5vcmln aW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE9wSW5mbyhtX2dyYXBoLmZyZWV6 ZShqc0RvdWJsZU51bWJlcihlZGdlLT5hc051bWJlcigpKSkpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIH0gZWxzZSBpZiAoZWRnZS0+aGFzSW50NTJSZXN1bHQoKSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJlc3VsdCA9IG1faW5zZXJ0aW9uU2V0Lmluc2VydE5vZGUoCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1faW5kZXhJbkJsb2NrLCBTcGVjSW50NTJBc0Rv dWJsZSwgRG91YmxlUmVwLCBub2RlLT5vcmlnaW4sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIEludDUyUmVwVXNlKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVzZUtpbmQgdXNl S2luZDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZWRnZS0+c2hvdWxkU3BlY3Vs YXRlRG91YmxlUmVhbCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1c2VLaW5k ID0gUmVhbE51bWJlclVzZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChl ZGdlLT5zaG91bGRTcGVjdWxhdGVOdW1iZXIoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdXNlS2luZCA9IE51bWJlclVzZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZUtpbmQgPSBOb3RDZWxsVXNl OworCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gbV9pbnNlcnRpb25TZXQu aW5zZXJ0Tm9kZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9pbmRleEluQmxv Y2ssIFNwZWNCeXRlY29kZURvdWJsZSwgRG91YmxlUmVwLCBub2RlLT5vcmlnaW4sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIHVzZUtpbmQpKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGlmIChlZGdl LT5oYXNEb3VibGVSZXN1bHQoKSkgewotICAgICAgICAgICAgICAgIHJlc3VsdCA9IG1faW5zZXJ0 aW9uU2V0Lmluc2VydE5vZGUoCi0gICAgICAgICAgICAgICAgICAgIG1faW5kZXhJbkJsb2NrLCBT cGVjQnl0ZWNvZGVEb3VibGUsIFZhbHVlUmVwLCBub2RlLT5vcmlnaW4sCi0gICAgICAgICAgICAg ICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIERvdWJsZVJlcFVzZSkpOwotICAgICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2Rl KAotICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY0ludDMyIHwgU3BlY0lu dDUyQXNEb3VibGUsIFZhbHVlUmVwLCBub2RlLT5vcmlnaW4sCi0gICAgICAgICAgICAgICAgICAg IEVkZ2UoZWRnZS5ub2RlKCksIEludDUyUmVwVXNlKSk7Ci0gICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgICAgIGNhc2UgSW50NTJSZXBVc2U6IHsKKyAgICAgICAgICAgICAgICAgICAgICAg IGlmIChlZGdlLT5oYXNJbnQ1MlJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVkZ2Ut PmlzTWFjaGluZUludENvbnN0YW50KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXN1bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY01hY2hpbmVJbnQsIEludDUyQ29uc3RhbnQs IG5vZGUtPm9yaWdpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgT3BJbmZvKGVk Z2UtPmNvbnN0YW50KCkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoZWRn ZS0+aGFzRG91YmxlUmVzdWx0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1 bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY01hY2hpbmVJbnQsIEludDUyUmVwLCBub2RlLT5v cmlnaW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVkZ2UoZWRnZS5ub2RlKCks IERvdWJsZVJlcE1hY2hpbmVJbnRVc2UpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAoZWRnZS0+c2hvdWxkU3BlY3VsYXRlSW50MzJGb3JBcml0aG1ldGljKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2Rl KAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgU3BlY0lu dDMyLCBJbnQ1MlJlcCwgbm9kZS0+b3JpZ2luLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBFZGdlKGVkZ2Uubm9kZSgpLCBJbnQzMlVzZSkpOworICAgICAgICAgICAgICAgICAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2luc2Vy dGlvblNldC5pbnNlcnROb2RlKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2lu ZGV4SW5CbG9jaywgU3BlY01hY2hpbmVJbnQsIEludDUyUmVwLCBub2RlLT5vcmlnaW4sCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIE1hY2hpbmVJbnRV c2UpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAg IGVkZ2Uuc2V0Tm9kZShyZXN1bHQpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0gfQor ICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OiB7CisgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoIWVkZ2UtPmhhc0RvdWJsZVJlc3VsdCgpICYmICFlZGdlLT5oYXNJbnQ1MlJlc3VsdCgpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGVkZ2UtPmhhc0RvdWJsZVJlc3VsdCgpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gbV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9pbmRleEluQmxvY2ssIFNwZWNCeXRl Y29kZURvdWJsZSwgVmFsdWVSZXAsIG5vZGUtPm9yaWdpbiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRWRnZShlZGdlLm5vZGUoKSwgRG91YmxlUmVwVXNlKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3Vs dCA9IG1faW5zZXJ0aW9uU2V0Lmluc2VydE5vZGUoCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1faW5kZXhJbkJsb2NrLCBTcGVjSW50MzIgfCBTcGVjSW50NTJBc0RvdWJsZSwgVmFs dWVSZXAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUtPm9yaWdpbiwgRWRn ZShlZGdlLm5vZGUoKSwgSW50NTJSZXBVc2UpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9IH0K KyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgICAgIGVkZ2Uuc2V0Tm9kZShy ZXN1bHQpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgICAgIAorICAgICAg ICBtX2luc2VydGlvblNldC5leGVjdXRlKGJsb2NrKTsKICAgICB9CiAgICAgCiAgICAgQmFzaWNC bG9jayogbV9ibG9jazsK