112845 2013-03-20 14:38:39 -0700 "" + x where x is not a string should be optimized by the DFG to some manner of ToString conversion 2013-03-20 15:41:50 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam webkit.review.bot oldest_to_newest 859747 0 fpizlo 2013-03-20 14:38:39 -0700 Patch forthcoming. 859763 1 194127 fpizlo 2013-03-20 14:58:55 -0700 Created attachment 194127 the patch 859766 2 webkit.review.bot 2013-03-20 15:02:44 -0700 Attachment 194127 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast/js/regress/empty-string-plus-int-expected.txt', u'LayoutTests/fast/js/regress/empty-string-plus-int.html', u'LayoutTests/fast/js/regress/script-tests/empty-string-plus-int.js', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/dfg/DFGFixupPhase.cpp', u'Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp', u'Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.h']" exit_code: 1 Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.h:51: The parameter name "type" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 859778 3 194127 mhahnenberg 2013-03-20 15:10:27 -0700 Comment on attachment 194127 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=194127&action=review r=me > Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp:46 > + if (isObjectSpeculation(type)) { > + // I'd love to fold this case into the case below, but I can't, because > + // removing SpecObject from something that only has an object > + // prediction and nothing else means we have an ill-formed SpeculatedType > + // (strong predict-none). This should be killed once we remove all traces > + // of static (aka weak) predictions. > + return type; > + } According to this comment, we can now delete this branch. 859812 4 fpizlo 2013-03-20 15:39:46 -0700 Landed in http://trac.webkit.org/changeset/146400 859813 5 fpizlo 2013-03-20 15:41:50 -0700 Test landed in http://trac.webkit.org/changeset/146400 194127 2013-03-20 14:58:55 -0700 2013-03-20 15:10:27 -0700 the patch blah.patch text/plain 14760 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ2MzkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTAzLTIwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg IiIgKyB4IHdoZXJlIHggaXMgbm90IGEgc3RyaW5nIHNob3VsZCBiZSBvcHRpbWl6ZWQgYnkgdGhl IERGRyB0byBzb21lIG1hbm5lciBvZiBUb1N0cmluZyBjb252ZXJzaW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI4NDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEkgbGlrZSB0byBkbyAi IiArIHguIFNvIEkgZGVjaWRlZCB0byBtYWtlIERGRyByZWNvZ25pemUgaXQsIGFuZCByZWxhdGVk IGlkaW9tcy4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNlLmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAgICAoSlNDOjpERkc6OkZpeHVw UGhhc2U6OmZpeHVwVG9QcmltaXRpdmUpOgorICAgICAgICAoRml4dXBQaGFzZSk6CisgICAgICAg IChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBUb1N0cmluZyk6CisgICAgICAgIChKU0M6OkRG Rzo6Rml4dXBQaGFzZTo6YXR0ZW1wdFRvTWFrZUZhc3RTdHJpbmdBZGQpOgorICAgICAgICAqIGRm Zy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 cmVzdWx0T2ZUb1ByaW1pdGl2ZSk6CisgICAgICAgIChERkcpOgorICAgICAgICAoSlNDOjpERkc6 OlByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlOjpwcm9wYWdhdGUpOgorICAgICAgICAqIGRmZy9E RkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5oOgorICAgICAgICAoREZHKToKKwogMjAxMy0w My0yMCAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAg IE9iamVjdGl2ZS1DIEFQSTogRml4IG92ZXItcmVsZWFzaW5nIGluIGFsbG9jYXRlQ29uc3RydWN0 b3JBbmRQcm90b3R5cGVXaXRoU3VwZXJDbGFzc0luZm86CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHJldmlzaW9uIDE0NjM4MykKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJERkdHcmFwaC5oIgogI2luY2x1ZGUgIkRGR0luc2Vy dGlvblNldC5oIgogI2luY2x1ZGUgIkRGR1BoYXNlLmgiCisjaW5jbHVkZSAiREZHUHJlZGljdGlv blByb3BhZ2F0aW9uUGhhc2UuaCIKICNpbmNsdWRlICJERkdWYXJpYWJsZUFjY2Vzc0RhdGFEdW1w LmgiCiAjaW5jbHVkZSAiT3BlcmF0aW9ucy5oIgogCkBAIC01NTUsNjEgKzU1NiwxMiBAQCBwcml2 YXRlOgogICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAgY2FzZSBUb1ByaW1pdGl2ZTog ewotICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVJbnRlZ2Vy KCkpIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50 MzJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgICAgICAgICBub2RlLT5jb252ZXJ0VG9J ZGVudGl0eSgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgCi0gICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZVN0 cmluZygpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxl PFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgIG5vZGUtPmNvbnZl cnRUb0lkZW50aXR5KCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICAKLSAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3Vs YXRlU3RyaW5nT2JqZWN0KCkKLSAgICAgICAgICAgICAgICAmJiBjYW5PcHRpbWl6ZVN0cmluZ09i amVjdEFjY2Vzcyhub2RlLT5jb2RlT3JpZ2luKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtp bmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsK LSAgICAgICAgICAgICAgICBub2RlLT5jb252ZXJ0VG9Ub1N0cmluZygpOwotICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAo bm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZVN0cmluZ09yU3RyaW5nT2JqZWN0KCkKLSAg ICAgICAgICAgICAgICAmJiBjYW5PcHRpbWl6ZVN0cmluZ09iamVjdEFjY2Vzcyhub2RlLT5jb2Rl T3JpZ2luKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJs ZTxTdHJpbmdPclN0cmluZ09iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAg ICAgIG5vZGUtPmNvbnZlcnRUb1RvU3RyaW5nKCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3Ry aW5nIHNwZWN1bGF0aW9uIGhlcmUuCi0gICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMTc1CisgICAgICAgICAgICBmaXh1cFRvUHJpbWl0aXZl KG5vZGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAg ICAgICBjYXNlIFRvU3RyaW5nOiB7Ci0gICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNo b3VsZFNwZWN1bGF0ZVN0cmluZygpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVu Ym94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAg ICAgIG5vZGUtPmNvbnZlcnRUb0lkZW50aXR5KCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDEo KS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT2JqZWN0KCkKLSAgICAgICAgICAgICAgICAmJiBjYW5P cHRpbWl6ZVN0cmluZ09iamVjdEFjY2Vzcyhub2RlLT5jb2RlT3JpZ2luKSkgewotICAgICAgICAg ICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdPYmplY3RVc2U+KG5v ZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIAotICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxh dGVTdHJpbmdPclN0cmluZ09iamVjdCgpCi0gICAgICAgICAgICAgICAgJiYgY2FuT3B0aW1pemVT dHJpbmdPYmplY3RBY2Nlc3Mobm9kZS0+Y29kZU9yaWdpbikpIHsKLSAgICAgICAgICAgICAgICBz ZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8U3RyaW5nT3JTdHJpbmdPYmplY3RVc2U+KG5v ZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIAotICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxh dGVDZWxsKCkpIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFi bGU8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgfQotICAgICAgICAgICAgCisgICAgICAgICAgICBmaXh1cFRvU3RyaW5nKG5vZGUp OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtOTgxLDYg KzkzMyw2MSBAQCBwcml2YXRlOgogICAgICAgICB9CiAgICAgfQogICAgIAorICAgIHZvaWQgZml4 dXBUb1ByaW1pdGl2ZShOb2RlKiBub2RlKQorICAgIHsKKyAgICAgICAgaWYgKG5vZGUtPmNoaWxk MSgpLT5zaG91bGRTcGVjdWxhdGVJbnRlZ2VyKCkpIHsKKyAgICAgICAgICAgIHNldFVzZUtpbmRB bmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAg ICAgbm9kZS0+Y29udmVydFRvSWRlbnRpdHkoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICAKKyAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxh dGVTdHJpbmcoKSkgeworICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxl PFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgbm9kZS0+Y29udmVydFRv SWRlbnRpdHkoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICAKKyAg ICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmdPYmplY3QoKQor ICAgICAgICAgICAgJiYgY2FuT3B0aW1pemVTdHJpbmdPYmplY3RBY2Nlc3Mobm9kZS0+Y29kZU9y aWdpbikpIHsKKyAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJp bmdPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIG5vZGUtPmNvbnZlcnRU b1RvU3RyaW5nKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT3JTdHJpbmdP YmplY3QoKQorICAgICAgICAgICAgJiYgY2FuT3B0aW1pemVTdHJpbmdPYmplY3RBY2Nlc3Mobm9k ZS0+Y29kZU9yaWdpbikpIHsKKyAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0 YWJsZTxTdHJpbmdPclN0cmluZ09iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAg ICAgbm9kZS0+Y29udmVydFRvVG9TdHJpbmcoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgIH0KKyAgICAKKyAgICB2b2lkIGZpeHVwVG9TdHJpbmcoTm9kZSogbm9kZSkKKyAg ICB7CisgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nKCkp IHsKKyAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdVc2U+ KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIG5vZGUtPmNvbnZlcnRUb0lkZW50aXR5KCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGlmIChu b2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT2JqZWN0KCkKKyAgICAgICAgICAg ICYmIGNhbk9wdGltaXplU3RyaW5nT2JqZWN0QWNjZXNzKG5vZGUtPmNvZGVPcmlnaW4pKSB7Cisg ICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8U3RyaW5nT2JqZWN0VXNl Pihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT3JT dHJpbmdPYmplY3QoKQorICAgICAgICAgICAgJiYgY2FuT3B0aW1pemVTdHJpbmdPYmplY3RBY2Nl c3Mobm9kZS0+Y29kZU9yaWdpbikpIHsKKyAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElm UHJvZml0YWJsZTxTdHJpbmdPclN0cmluZ09iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBpZiAobm9kZS0+ Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUNlbGwoKSkgeworICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0KKyAgICAKICAgICB0ZW1wbGF0ZTxVc2VLaW5k IGxlZnRVc2VLaW5kPgogICAgIGJvb2wgYXR0ZW1wdFRvTWFrZUZhc3RTdHJpbmdBZGQoTm9kZSog bm9kZSwgRWRnZSYgbGVmdCwgRWRnZSYgcmlnaHQpCiAgICAgewpAQCAtOTg5LDMyICs5OTYsMzcg QEAgcHJpdmF0ZToKICAgICAgICAgaWYgKGlzU3RyaW5nT2JqZWN0VXNlPGxlZnRVc2VLaW5kPigp ICYmICFjYW5PcHRpbWl6ZVN0cmluZ09iamVjdEFjY2Vzcyhub2RlLT5jb2RlT3JpZ2luKSkKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgCi0gICAgICAgIGlmIChyaWdodC0+c2hv dWxkU3BlY3VsYXRlU3RyaW5nKCkpIHsKLSAgICAgICAgICAgIGNvbnZlcnRTdHJpbmdBZGRVc2U8 bGVmdFVzZUtpbmQ+KG5vZGUsIGxlZnQpOwotICAgICAgICAgICAgY29udmVydFN0cmluZ0FkZFVz ZTxTdHJpbmdVc2U+KG5vZGUsIHJpZ2h0KTsKLSAgICAgICAgICAgIGNvbnZlcnRUb01ha2VSb3Bl KG5vZGUpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KKyAgICAgICAgY29u dmVydFN0cmluZ0FkZFVzZTxsZWZ0VXNlS2luZD4obm9kZSwgbGVmdCk7CiAgICAgICAgIAotICAg ICAgICBpZiAocmlnaHQtPnNob3VsZFNwZWN1bGF0ZVN0cmluZ09iamVjdCgpCi0gICAgICAgICAg ICAmJiBjYW5PcHRpbWl6ZVN0cmluZ09iamVjdEFjY2Vzcyhub2RlLT5jb2RlT3JpZ2luKSkgewot ICAgICAgICAgICAgY29udmVydFN0cmluZ0FkZFVzZTxsZWZ0VXNlS2luZD4obm9kZSwgbGVmdCk7 CisgICAgICAgIGlmIChyaWdodC0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nKCkpCisgICAgICAgICAg ICBjb252ZXJ0U3RyaW5nQWRkVXNlPFN0cmluZ1VzZT4obm9kZSwgcmlnaHQpOworICAgICAgICBl bHNlIGlmIChyaWdodC0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT2JqZWN0KCkgJiYgY2FuT3B0aW1p emVTdHJpbmdPYmplY3RBY2Nlc3Mobm9kZS0+Y29kZU9yaWdpbikpCiAgICAgICAgICAgICBjb252 ZXJ0U3RyaW5nQWRkVXNlPFN0cmluZ09iamVjdFVzZT4obm9kZSwgcmlnaHQpOwotICAgICAgICAg ICAgY29udmVydFRvTWFrZVJvcGUobm9kZSk7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICAgICAgfQotICAgICAgICAKLSAgICAgICAgaWYgKHJpZ2h0LT5zaG91bGRTcGVjdWxhdGVTdHJp bmdPclN0cmluZ09iamVjdCgpCi0gICAgICAgICAgICAmJiBjYW5PcHRpbWl6ZVN0cmluZ09iamVj dEFjY2Vzcyhub2RlLT5jb2RlT3JpZ2luKSkgewotICAgICAgICAgICAgY29udmVydFN0cmluZ0Fk ZFVzZTxsZWZ0VXNlS2luZD4obm9kZSwgbGVmdCk7CisgICAgICAgIGVsc2UgaWYgKHJpZ2h0LT5z aG91bGRTcGVjdWxhdGVTdHJpbmdPclN0cmluZ09iamVjdCgpICYmIGNhbk9wdGltaXplU3RyaW5n T2JqZWN0QWNjZXNzKG5vZGUtPmNvZGVPcmlnaW4pKQogICAgICAgICAgICAgY29udmVydFN0cmlu Z0FkZFVzZTxTdHJpbmdPclN0cmluZ09iamVjdFVzZT4obm9kZSwgcmlnaHQpOwotICAgICAgICAg ICAgY29udmVydFRvTWFrZVJvcGUobm9kZSk7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgZWxzZSB7CisgICAgICAgICAgICAvLyBBdCB0aGlzIHBvaW50IHdlIGtub3cgdGhhdCB0 aGUgb3RoZXIgb3BlcmFuZCBpcyBzb21ldGhpbmcgd2VpcmQuIFRoZSBzZW1hbnRpY2FsbHkgY29y cmVjdAorICAgICAgICAgICAgLy8gd2F5IG9mIGRlYWxpbmcgd2l0aCB0aGlzIGlzOgorICAgICAg ICAgICAgLy8KKyAgICAgICAgICAgIC8vIE1ha2VSb3BlKEBsZWZ0LCBUb1N0cmluZyhUb1ByaW1p dGl2ZShAcmlnaHQpKSkKKyAgICAgICAgICAgIC8vCisgICAgICAgICAgICAvLyBTbyB0aGF0J3Mg d2hhdCB3ZSBlbWl0LiBOQiwgd2UgbmVlZCB0byBkbyBhbGwgcmVsZXZhbnQgdHlwZSBjaGVja3Mg b24gQGxlZnQgYmVmb3JlIHdlIGRvCisgICAgICAgICAgICAvLyBhbnl0aGluZyB0byBAcmlnaHQs IHNpbmNlIFRvUHJpbWl0aXZlIG1heSBiZSBlZmZlY3RmdWwuCisgICAgICAgICAgICAKKyAgICAg ICAgICAgIE5vZGUqIHRvUHJpbWl0aXZlID0gbV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKKyAg ICAgICAgICAgICAgICBtX2luZGV4SW5CbG9jaywgcmVzdWx0T2ZUb1ByaW1pdGl2ZShyaWdodC0+ cHJlZGljdGlvbigpKSwgVG9QcmltaXRpdmUsIG5vZGUtPmNvZGVPcmlnaW4sCisgICAgICAgICAg ICAgICAgRWRnZShyaWdodC5ub2RlKCkpKTsKKyAgICAgICAgICAgIE5vZGUqIHRvU3RyaW5nID0g bV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKKyAgICAgICAgICAgICAgICBtX2luZGV4SW5CbG9j aywgU3BlY1N0cmluZywgVG9TdHJpbmcsIG5vZGUtPmNvZGVPcmlnaW4sIEVkZ2UodG9QcmltaXRp dmUpKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgZml4dXBUb1ByaW1pdGl2ZSh0b1ByaW1p dGl2ZSk7CisgICAgICAgICAgICBmaXh1cFRvU3RyaW5nKHRvU3RyaW5nKTsKKyAgICAgICAgICAg IAorICAgICAgICAgICAgcmlnaHQuc2V0Tm9kZSh0b1N0cmluZyk7CiAgICAgICAgIH0KICAgICAg ICAgCi0gICAgICAgIC8vIEZJWE1FOiBXZSBvdWdodCB0byBiZSBhYmxlIHRvIGNvbnZlcnQgdGhl IHJpZ2h0IGNhc2UgdG8gZG8KLSAgICAgICAgLy8gVG9QcmltaXRpdmVUb1N0cmluZy4KLSAgICAg ICAgcmV0dXJuIGZhbHNlOyAvLyBMZXQgdGhlIHNsb3cgcGF0aCB3b3JyeSBhYm91dCBpdC4KKyAg ICAgICAgY29udmVydFRvTWFrZVJvcGUobm9kZSk7CisgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KICAgICAKICAgICBib29sIGlzU3RyaW5nUHJvdG90eXBlTWV0aG9kU2FuZShTdHJ1Y3R1cmUq IHN0cmluZ1Byb3RvdHlwZVN0cnVjdHVyZSwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQpCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rp b25Qcm9wYWdhdGlvblBoYXNlLmNwcAkocmV2aXNpb24gMTQ2MzgzKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM0LDYgKzM0LDI2IEBACiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgREZH IHsKIAorU3BlY3VsYXRlZFR5cGUgcmVzdWx0T2ZUb1ByaW1pdGl2ZShTcGVjdWxhdGVkVHlwZSB0 eXBlKQoreworICAgIGlmIChpc09iamVjdFNwZWN1bGF0aW9uKHR5cGUpKSB7CisgICAgICAgIC8v IEknZCBsb3ZlIHRvIGZvbGQgdGhpcyBjYXNlIGludG8gdGhlIGNhc2UgYmVsb3csIGJ1dCBJIGNh bid0LCBiZWNhdXNlCisgICAgICAgIC8vIHJlbW92aW5nIFNwZWNPYmplY3QgZnJvbSBzb21ldGhp bmcgdGhhdCBvbmx5IGhhcyBhbiBvYmplY3QKKyAgICAgICAgLy8gcHJlZGljdGlvbiBhbmQgbm90 aGluZyBlbHNlIG1lYW5zIHdlIGhhdmUgYW4gaWxsLWZvcm1lZCBTcGVjdWxhdGVkVHlwZQorICAg ICAgICAvLyAoc3Ryb25nIHByZWRpY3Qtbm9uZSkuIFRoaXMgc2hvdWxkIGJlIGtpbGxlZCBvbmNl IHdlIHJlbW92ZSBhbGwgdHJhY2VzCisgICAgICAgIC8vIG9mIHN0YXRpYyAoYWthIHdlYWspIHBy ZWRpY3Rpb25zLgorICAgICAgICByZXR1cm4gdHlwZTsKKyAgICB9CisgICAgCisgICAgaWYgKHR5 cGUgJiBTcGVjT2JqZWN0KSB7CisgICAgICAgIC8vIE9iamVjdHMgZ2V0IHR1cm5lZCBpbnRvIHN0 cmluZ3MuIFNvIGlmIHRoZSBpbnB1dCBoYXMgaGludHMgb2Ygb2JqZWN0bmVzcywKKyAgICAgICAg Ly8gdGhlIG91dHB1dCB3aWxsIGhhdmUgaGluc3RzIG9mIHN0cmluZ2luZXNzLgorICAgICAgICBy ZXR1cm4gbWVyZ2VTcGVjdWxhdGlvbnModHlwZSAmIH5TcGVjT2JqZWN0LCBTcGVjU3RyaW5nKTsK KyAgICB9CisgICAgCisgICAgcmV0dXJuIHR5cGU7Cit9CisKIGNsYXNzIFByZWRpY3Rpb25Qcm9w YWdhdGlvblBoYXNlIDogcHVibGljIFBoYXNlIHsKIHB1YmxpYzoKICAgICBQcmVkaWN0aW9uUHJv cGFnYXRpb25QaGFzZShHcmFwaCYgZ3JhcGgpCkBAIC00MjEsMjIgKzQ0MSw4IEBAIHByaXZhdGU6 CiAgICAgICAgICAgICAKICAgICAgICAgY2FzZSBUb1ByaW1pdGl2ZTogewogICAgICAgICAgICAg U3BlY3VsYXRlZFR5cGUgY2hpbGQgPSBub2RlLT5jaGlsZDEoKS0+cHJlZGljdGlvbigpOwotICAg ICAgICAgICAgaWYgKGNoaWxkKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzT2JqZWN0U3BlY3Vs YXRpb24oY2hpbGQpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIEknZCBsb3ZlIHRvIGZvbGQg dGhpcyBjYXNlIGludG8gdGhlIGNhc2UgYmVsb3csIGJ1dCBJIGNhbid0LCBiZWNhdXNlCi0gICAg ICAgICAgICAgICAgICAgIC8vIHJlbW92aW5nIFNwZWNPYmplY3QgZnJvbSBzb21ldGhpbmcgdGhh dCBvbmx5IGhhcyBhbiBvYmplY3QKLSAgICAgICAgICAgICAgICAgICAgLy8gcHJlZGljdGlvbiBh bmQgbm90aGluZyBlbHNlIG1lYW5zIHdlIGhhdmUgYW4gaWxsLWZvcm1lZCBTcGVjdWxhdGVkVHlw ZQotICAgICAgICAgICAgICAgICAgICAvLyAoc3Ryb25nIHByZWRpY3Qtbm9uZSkuIFRoaXMgc2hv dWxkIGJlIGtpbGxlZCBvbmNlIHdlIHJlbW92ZSBhbGwgdHJhY2VzCi0gICAgICAgICAgICAgICAg ICAgIC8vIG9mIHN0YXRpYyAoYWthIHdlYWspIHByZWRpY3Rpb25zLgotICAgICAgICAgICAgICAg ICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihTcGVjU3RyaW5nKTsKLSAgICAgICAgICAg ICAgICB9IGVsc2UgaWYgKGNoaWxkICYgU3BlY09iamVjdCkgewotICAgICAgICAgICAgICAgICAg ICAvLyBPYmplY3RzIGdldCB0dXJuZWQgaW50byBzdHJpbmdzLiBTbyBpZiB0aGUgaW5wdXQgaGFz IGhpbnRzIG9mIG9iamVjdG5lc3MsCi0gICAgICAgICAgICAgICAgICAgIC8vIHRoZSBvdXRwdXQg d2lsbCBoYXZlIGhpbnN0cyBvZiBzdHJpbmdpbmVzcy4KLSAgICAgICAgICAgICAgICAgICAgY2hh bmdlZCB8PSBtZXJnZVByZWRpY3Rpb24oCi0gICAgICAgICAgICAgICAgICAgICAgICBtZXJnZVNw ZWN1bGF0aW9ucyhjaGlsZCAmIH5TcGVjT2JqZWN0LCBTcGVjU3RyaW5nKSk7Ci0gICAgICAgICAg ICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VQcmVkaWN0 aW9uKGNoaWxkKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChjaGlsZCkKKyAgICAg ICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihyZXN1bHRPZlRvUHJpbWl0aXZl KGNoaWxkKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBo YXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0 aW9uUHJvcGFnYXRpb25QaGFzZS5oCShyZXZpc2lvbiAxNDYzODMpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMwLDYgKzMwLDggQEAKIAogI2lmIEVOQUJMRShERkdfSklUKQogCisjaW5jbHVkZSAi U3BlY3VsYXRlZFR5cGUuaCIKKwogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBERkcgewogCiBj bGFzcyBHcmFwaDsKQEAgLTQ1LDYgKzQ3LDkgQEAgY2xhc3MgR3JhcGg7CiAKIGJvb2wgcGVyZm9y bVByZWRpY3Rpb25Qcm9wYWdhdGlvbihHcmFwaCYpOwogCisvLyBIZWxwZXIgdXNlZCBmb3IgRml4 dXBQaGFzZSBmb3IgY29tcHV0aW5nIHRoZSBwcmVkaWN0ZWQgdHlwZSBvZiBhIFRvUHJpbWl0aXZl LgorU3BlY3VsYXRlZFR5cGUgcmVzdWx0T2ZUb1ByaW1pdGl2ZShTcGVjdWxhdGVkVHlwZSB0eXBl KTsKKwogfSB9IC8vIG5hbWVzcGFjZSBKU0M6OkRGRzo6UGhhc2UKIAogI2VuZGlmIC8vIEVOQUJM RShERkdfSklUKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ2MzkyKQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDMtMjAgIEZpbGlw IFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICAiIiArIHggd2hlcmUgeCBpcyBu b3QgYSBzdHJpbmcgc2hvdWxkIGJlIG9wdGltaXplZCBieSB0aGUgREZHIHRvIHNvbWUgbWFubmVy IG9mIFRvU3RyaW5nIGNvbnZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMjg0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9qcy9yZWdyZXNzL2VtcHR5LXN0cmluZy1wbHVzLWludC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvanMvcmVncmVzcy9lbXB0eS1zdHJp bmctcGx1cy1pbnQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9qcy9yZWdyZXNzL3Njcmlw dC10ZXN0cy9lbXB0eS1zdHJpbmctcGx1cy1pbnQuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToK KwogMjAxMy0wMy0yMCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBBbGxvdyBwb3J0cyBzcGVjaWZpYyB0ZXh0IHRyYWNrIG1lbnUKSW5kZXg6IExheW91 dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9lbXB0eS1zdHJpbmctcGx1cy1pbnQtZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9lbXB0eS1zdHJpbmct cGx1cy1pbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9q cy9yZWdyZXNzL2VtcHR5LXN0cmluZy1wbHVzLWludC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29w eSkKQEAgLTAsMCArMSwxMCBAQAorSlNSZWdyZXNzL2VtcHR5LXN0cmluZy1wbHVzLWludAorCitP biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs b3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBubyBleGNlcHRpb24gdGhyb3duCitQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDog TGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdyZXNzL2VtcHR5LXN0cmluZy1wbHVzLWludC5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9lbXB0eS1zdHJpbmctcGx1 cy1pbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9l bXB0eS1zdHJpbmctcGx1cy1pbnQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEyIEBA Cis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4K KzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvcmVncmVzcy1wcmUu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9lbXB0eS1zdHJpbmctcGx1 cy1pbnQuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9yZWdyZXNzLXBvc3Qu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9qcy9y ZWdyZXNzL3NjcmlwdC10ZXN0cy9lbXB0eS1zdHJpbmctcGx1cy1pbnQuanMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdyZXNzL3NjcmlwdC10ZXN0cy9lbXB0eS1zdHJpbmct cGx1cy1pbnQuanMJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2pzL3JlZ3Jlc3Mv c2NyaXB0LXRlc3RzL2VtcHR5LXN0cmluZy1wbHVzLWludC5qcwkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDExIEBACitmdW5jdGlvbiBmb28oeCkgeworICAgIHJldHVybiAiIiArIHg7Cit9CisK K3ZhciByZXN1bHQ7Cit2YXIgbGltaXQgPSAxMDAwMDA7Citmb3IgKHZhciBpID0gMDsgaSA8IGxp bWl0OyArK2kpCisgICAgcmVzdWx0ID0gZm9vKGkpOworCitpZiAocmVzdWx0ICE9IFN0cmluZyhs aW1pdCAtIDEpKQorICAgIHRocm93ICJFcnJvcjogYmFkIHJlc3VsdDogIiArIHJlc3VsdDsK