163182 2016-10-09 10:26:48 -0700 ValueAdd should be constant folded if the operands are constant String,Primitive or Primitive,String 2016-10-16 19:11:52 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam cdumez commit-queue darin fpizlo keith_miller mark.lam msaboff rniwa youennf ysuzuki oldest_to_newest 1238089 0 saam 2016-10-09 10:26:48 -0700 This comes up in Dromaeo 1238144 1 ysuzuki 2016-10-09 17:41:42 -0700 NICE! 1238316 2 291110 saam 2016-10-10 08:56:39 -0700 Created attachment 291110 WIP 1238324 3 291112 saam 2016-10-10 09:12:59 -0700 Created attachment 291112 WIP 1238697 4 291215 saam 2016-10-10 19:42:34 -0700 Created attachment 291215 patch 1238771 5 saam 2016-10-10 23:49:46 -0700 Two Dromaeo runs of relevant tests both with patched and non-patched JSC. Looks good. Pactched version: 1. element.expando = value:Runs -> [15259, 15286, 15789, 15963, 16001] runs/s mean: 15659.6 runs/s median: 15789 runs/s stdev: 362.42488877007344 runs/s min: 15259 runs/s max: 16001 runs/s element.expando:Runs -> [177329, 293077, 294280, 294527, 295861] runs/s mean: 271014.8 runs/s median: 294280 runs/s stdev: 52381.28607814054 runs/s min: 177329 runs/s max: 295861 runs/s :Runs -> [14050.009403493468, 14528.250866673368, 14985.00953013684, 15142.30571354955, 15180.021487067997] runs/s mean: 14777.119400184245 runs/s median: 14985.00953013684 runs/s stdev: 482.0617013090354 runs/s min: 14050.009403493468 runs/s max: 15180.021487067997 runs/s 2. element.expando = value:Runs -> [15324, 15624, 15644, 15783, 15821] runs/s mean: 15639.2 runs/s median: 15644 runs/s stdev: 195.7899384544569 runs/s min: 15324 runs/s max: 15821 runs/s element.expando:Runs -> [171449, 291956, 292678, 292877, 294543] runs/s mean: 268700.6 runs/s median: 292678 runs/s stdev: 54373.54825004526 runs/s min: 171449 runs/s max: 294543 runs/s :Runs -> [14066.72525472097, 14830.354847519346, 14850.23654491084, 14975.953123177605, 15014.514579654855] runs/s mean: 14747.556869996724 runs/s median: 14850.23654491084 runs/s stdev: 388.7034783399407 runs/s min: 14066.72525472097 runs/s max: 15014.514579654855 runs/s Unpatched version: 1. element.expando = value:Runs -> [780.2197802197802, 797, 800, 802, 805] runs/s mean: 796.843956043956 runs/s median: 800 runs/s stdev: 9.739789875703048 runs/s min: 780.2197802197802 runs/s max: 805 runs/s element.expando:Runs -> [1010, 1014, 1015, 1019, 1019] runs/s mean: 1015.4 runs/s median: 1015 runs/s stdev: 3.781534080237811 runs/s min: 1010 runs/s max: 1019 runs/s :Runs -> [440.18169541464613, 446.24958586416346, 447.3829201101929, 448.78528281164193, 449.7231359649123] runs/s mean: 446.46452403311133 runs/s median: 447.3829201101929 runs/s stdev: 3.753933212314692 runs/s min: 440.18169541464613 runs/s max: 449.7231359649123 runs/s 2. element.expando = value:Runs -> [763, 791, 793, 793.2067932067932, 797] runs/s mean: 787.4413586413586 runs/s median: 793 runs/s stdev: 13.83428977812362 runs/s min: 763 runs/s max: 797 runs/s element.expando:Runs -> [1001, 1007, 1008, 1008, 1013] runs/s mean: 1007.4 runs/s median: 1008 runs/s stdev: 4.277849927241485 runs/s min: 1001 runs/s max: 1013 runs/s :Runs -> [432.97222222222223, 443.01279199110115, 443.83342587451415, 443.8981967911402, 446.05580110497243] runs/s mean: 441.95448759679005 runs/s median: 443.83342587451415 runs/s stdev: 5.146121996860227 runs/s min: 432.97222222222223 runs/s max: 446.05580110497243 runs/s 1238779 6 291215 commit-queue 2016-10-11 00:30:43 -0700 Comment on attachment 291215 patch Clearing flags on attachment: 291215 Committed r207060: <http://trac.webkit.org/changeset/207060> 1238780 7 commit-queue 2016-10-11 00:30:48 -0700 All reviewed patches have been landed. Closing bug. 1238799 8 youennf 2016-10-11 03:17:39 -0700 Reopening to attach new patch. 1238800 9 291245 youennf 2016-10-11 03:17:45 -0700 Created attachment 291245 Patch for landing 1238801 10 291245 commit-queue 2016-10-11 03:18:37 -0700 Comment on attachment 291245 Patch for landing Rejecting attachment 291245 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 291245, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: /show_bug.cgi?id=163182&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 291245 from bug 163182. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit No diff found. at /Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply line 128. Parsed 0 diffs from patch file(s). Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/2261477 1238802 11 youennf 2016-10-11 03:20:02 -0700 (In reply to comment #10) > Comment on attachment 291245 [details] > Patch for landing Wrong bug 1240738 12 291215 darin 2016-10-16 11:09:57 -0700 Comment on attachment 291215 patch View in context: https://bugs.webkit.org/attachment.cgi?id=291215&action=review > Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:345 > + if (!value) > + return String(); > + if (value.isInt32()) > + return String::number(value.asInt32()); > + if (value.isNumber()) > + return String::numberToStringECMAScript(value.asNumber()); > + if (value.isBoolean()) > + return value.asBoolean() ? ASCIILiteral("true") : ASCIILiteral("false"); > + if (value.isNull()) > + return ASCIILiteral("null"); > + if (value.isUndefined()) > + return ASCIILiteral("undefined"); This seems so repetitive with code in the JSValue class. Is there some way to share more of this? 1240751 13 fpizlo 2016-10-16 11:37:23 -0700 (In reply to comment #12) > Comment on attachment 291215 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291215&action=review > > > Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:345 > > + if (!value) > > + return String(); > > + if (value.isInt32()) > > + return String::number(value.asInt32()); > > + if (value.isNumber()) > > + return String::numberToStringECMAScript(value.asNumber()); > > + if (value.isBoolean()) > > + return value.asBoolean() ? ASCIILiteral("true") : ASCIILiteral("false"); > > + if (value.isNull()) > > + return ASCIILiteral("null"); > > + if (value.isUndefined()) > > + return ASCIILiteral("undefined"); > > This seems so repetitive with code in the JSValue class. Is there some way > to share more of this? The cost of sharing is probably greater than the benefit. This code is subtly different. The JSValue code uses VM number string caches, which the JIT can't do. The JIT gives up for effects while JSValue executes them. It's repetitive in structure, but if you tried to build an abstraction that deduplicates the code then your abstraction is likely to be about the same amount of code than writing this twice. We often have repetitive code like this in the JIT. I think that it's served us well because the worst case is that the JIT constant folds according to wrong rules. The worst case if you share code is that the shared code goes down a path that isn't legal in the JIT, like accessing some VM state that isn't protected by locks. Constant folding rules are trivial to write tests for, so we're more paranoid about the races. Finally, I think that this duplication is mostly harmless because it's just a statement of core JSC semantics. Duplication sucks most if you want to change the duplicated code later. But the stringification rules of these types can't be changed without breaking the web. 1240813 14 291215 darin 2016-10-16 17:01:32 -0700 Comment on attachment 291215 patch View in context: https://bugs.webkit.org/attachment.cgi?id=291215&action=review >>> Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:345 >>> + return ASCIILiteral("undefined"); >> >> This seems so repetitive with code in the JSValue class. Is there some way to share more of this? > > The cost of sharing is probably greater than the benefit. > > This code is subtly different. The JSValue code uses VM number string caches, which the JIT can't do. The JIT gives up for effects while JSValue executes them. It's repetitive in structure, but if you tried to build an abstraction that deduplicates the code then your abstraction is likely to be about the same amount of code than writing this twice. > > We often have repetitive code like this in the JIT. I think that it's served us well because the worst case is that the JIT constant folds according to wrong rules. The worst case if you share code is that the shared code goes down a path that isn't legal in the JIT, like accessing some VM state that isn't protected by locks. Constant folding rules are trivial to write tests for, so we're more paranoid about the races. > > Finally, I think that this duplication is mostly harmless because it's just a statement of core JSC semantics. Duplication sucks most if you want to change the duplicated code later. But the stringification rules of these types can't be changed without breaking the web. Not surprising that the one used in actual runtime has some optimizations like that. I should have looked; I see now that there isn’t really good code to share with. I wasn't suggesting we build try to build a significant new abstraction, so that’s a bit of a straw man. I think my concern grew out of worries that this code might have used the wrong function, say String::number instead of String::numberToStringECMAScript, and it was likely we would not cover that in testing. I think we may need a couple more test cases for floating point that were included in the original patch. 1240820 15 fpizlo 2016-10-16 17:19:54 -0700 (In reply to comment #14) > Comment on attachment 291215 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291215&action=review > > >>> Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:345 > >>> + return ASCIILiteral("undefined"); > >> > >> This seems so repetitive with code in the JSValue class. Is there some way to share more of this? > > > > The cost of sharing is probably greater than the benefit. > > > > This code is subtly different. The JSValue code uses VM number string caches, which the JIT can't do. The JIT gives up for effects while JSValue executes them. It's repetitive in structure, but if you tried to build an abstraction that deduplicates the code then your abstraction is likely to be about the same amount of code than writing this twice. > > > > We often have repetitive code like this in the JIT. I think that it's served us well because the worst case is that the JIT constant folds according to wrong rules. The worst case if you share code is that the shared code goes down a path that isn't legal in the JIT, like accessing some VM state that isn't protected by locks. Constant folding rules are trivial to write tests for, so we're more paranoid about the races. > > > > Finally, I think that this duplication is mostly harmless because it's just a statement of core JSC semantics. Duplication sucks most if you want to change the duplicated code later. But the stringification rules of these types can't be changed without breaking the web. > > Not surprising that the one used in actual runtime has some optimizations > like that. I should have looked; I see now that there isn’t really good code > to share with. > > I wasn't suggesting we build try to build a significant new abstraction, so > that’s a bit of a straw man. FWIW, we build such abstractions when we find that the code saved is bigger than the size of the abstraction. Refactoring Yarr to be completely thread-safe so that the JIT can run it to constant-folding regular expression operations is one extreme example. So, I didn't mean it as a straw man. It probably would have been worth it if we were only abstracting whether to call the effectful slow path. > > I think my concern grew out of worries that this code might have used the > wrong function, say String::number instead of > String::numberToStringECMAScript, and it was likely we would not cover that > in testing. I think we may need a couple more test cases for floating point > that were included in the original patch. Isn't String::numberToStringECMAScript already the abstraction of how you convert non-int numbers to strings? String::number is safe for int32's, in the sense that the rest of the VM also already assumes that this is a valid int32->string conversion according to ES. 1240844 16 saam 2016-10-16 19:10:05 -0700 (In reply to comment #14) > Comment on attachment 291215 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291215&action=review > > >>> Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:345 > >>> + return ASCIILiteral("undefined"); > >> > >> This seems so repetitive with code in the JSValue class. Is there some way to share more of this? > > > > The cost of sharing is probably greater than the benefit. > > > > This code is subtly different. The JSValue code uses VM number string caches, which the JIT can't do. The JIT gives up for effects while JSValue executes them. It's repetitive in structure, but if you tried to build an abstraction that deduplicates the code then your abstraction is likely to be about the same amount of code than writing this twice. > > > > We often have repetitive code like this in the JIT. I think that it's served us well because the worst case is that the JIT constant folds according to wrong rules. The worst case if you share code is that the shared code goes down a path that isn't legal in the JIT, like accessing some VM state that isn't protected by locks. Constant folding rules are trivial to write tests for, so we're more paranoid about the races. > > > > Finally, I think that this duplication is mostly harmless because it's just a statement of core JSC semantics. Duplication sucks most if you want to change the duplicated code later. But the stringification rules of these types can't be changed without breaking the web. > > Not surprising that the one used in actual runtime has some optimizations > like that. I should have looked; I see now that there isn’t really good code > to share with. > > I wasn't suggesting we build try to build a significant new abstraction, so > that’s a bit of a straw man. > > I think my concern grew out of worries that this code might have used the > wrong function, say String::number instead of > String::numberToStringECMAScript, and it was likely we would not cover that > in testing. I think we may need a couple more test cases for floating point > that were included in the original patch. I agree that it's worth adding more floating point tests to prevent regressions in the future. An early version of my patch had a FIXME for the double case because I was tempted to use String::number but was suspicious of its correctness (this is before I looked at what the runtime version did). So I can see how this code could go wrong. I'll do the tests in a follow up patch. 1240846 17 saam 2016-10-16 19:11:52 -0700 Bug for tests: https://bugs.webkit.org/show_bug.cgi?id=163517 291110 2016-10-10 08:56:39 -0700 2016-10-10 09:12:59 -0700 WIP b-backup.diff text/plain 4055 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIu Y3BwCShyZXZpc2lvbiAyMDY5NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5 dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIzOSw3ICs0MjM5LDEyIEBAIGJv b2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAgICAgICBC eVZhbEluZm8qIGJ5VmFsSW5mbyA9IG1faW5saW5lU3RhY2tUb3AtPm1fYnlWYWxJbmZvcy5nZXQo Q29kZU9yaWdpbihjdXJyZW50Q29kZU9yaWdpbigpLmJ5dGVjb2RlSW5kZXgpKTsKICAgICAgICAg ICAgICAgICAvLyBGSVhNRTogV2hlbiB0aGUgYnl0ZWNvZGUgaXMgbm90IGNvbXBpbGVkIGluIHRo ZSBiYXNlbGluZSBKSVQsIGJ5VmFsSW5mbyBiZWNvbWVzIG51bGwuCiAgICAgICAgICAgICAgICAg Ly8gQXQgdGhhdCB0aW1lLCB0aGVyZSBpcyBubyBpbmZvcm1hdGlvbi4KLSAgICAgICAgICAgICAg ICBpZiAoYnlWYWxJbmZvICYmIGJ5VmFsSW5mby0+c3R1YkluZm8gJiYgIWJ5VmFsSW5mby0+dG9v a1Nsb3dQYXRoICYmICFtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRl KG1fY3VycmVudEluZGV4LCBCYWRJZGVudCkgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFBy b2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENlbGwpKSB7CisgICAgICAgICAg ICAgICAgaWYgKGJ5VmFsSW5mbyAKKyAgICAgICAgICAgICAgICAgICAgICAgICYmIGJ5VmFsSW5m by0+c3R1YkluZm8KKyAgICAgICAgICAgICAgICAgICAgICAgICYmICFieVZhbEluZm8tPnRvb2tT bG93UGF0aAorICAgICAgICAgICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1f ZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZElkZW50KQorICAgICAg ICAgICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFz RXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZFR5cGUpCisgICAgICAgICAgICAgICAgICAgICAg ICAmJiAhbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJl bnRJbmRleCwgQmFkQ2VsbCkpIHsKICAgICAgICAgICAgICAgICAgICAgY29tcGlsZWRBc1B1dEJ5 SWQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVy ID0gbV9ncmFwaC5pZGVudGlmaWVycygpLmVuc3VyZShieVZhbEluZm8tPmNhY2hlZElkLmltcGwo KSk7CiAgICAgICAgICAgICAgICAgICAgIFVuaXF1ZWRTdHJpbmdJbXBsKiB1aWQgPSBtX2dyYXBo LmlkZW50aWZpZXJzKClbaWRlbnRpZmllck51bWJlcl07CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1N0cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAJKHJl dmlzaW9uIDIwNjk2OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhS ZWR1Y3Rpb25QaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyMiw4ICszMjIsNDcgQEAgcHJp dmF0ZToKICAgICAgICAgLy8gbW92ZSB0aGVzZSB0byB0aGUgYWJzdHJhY3QgaW50ZXJwcmV0ZXIg b25jZSBBYnN0cmFjdFZhbHVlIGNhbiBzdXBwb3J0IExhenlKU1ZhbHVlLgogICAgICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MjA0CiAKKyAgICAgICAg Y2FzZSBWYWx1ZUFkZDogeworICAgICAgICAgICAgaWYgKG1fbm9kZS0+Y2hpbGQxKCktPmlzQ29u c3RhbnQoKSAmJiBtX25vZGUtPmNoaWxkMigpLT5pc0NvbnN0YW50KCkgJiYgKCEhbV9ub2RlLT5j aGlsZDEoKS0+dHJ5R2V0U3RyaW5nKG1fZ3JhcGgpIHx8ICEhbV9ub2RlLT5jaGlsZDIoKS0+dHJ5 R2V0U3RyaW5nKG1fZ3JhcGgpKSkgeworICAgICAgICAgICAgICAgIGF1dG8gdHJ5R2V0Q29uc3Rh bnQgPSBbJl0gKE5vZGUqIG5vZGUpIC0+IFN0cmluZyB7CisgICAgICAgICAgICAgICAgICAgIFN0 cmluZyBzdHJpbmcgPSBub2RlLT50cnlHZXRTdHJpbmcobV9ncmFwaCk7CisgICAgICAgICAgICAg ICAgICAgIGlmICghc3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBzdHJpbmc7CisgICAgICAgICAgICAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBub2RlLT5j b25zdGFudCgpLT52YWx1ZSgpOworICAgICAgICAgICAgICAgICAgICBpZiAoIXZhbHVlKQorICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICAgICAgICAgICAg ICBpZiAodmFsdWUuaXNJbnQzMigpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0 cmluZzo6bnVtYmVyKHZhbHVlLmFzSW50MzIoKSk7CisgICAgICAgICAgICAgICAgICAgIGlmICh2 YWx1ZS5pc051bWJlcigpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZzo6 bnVtYmVyVG9TdHJpbmdFQ01BU2NyaXB0KHZhbHVlLmFzTnVtYmVyKCkpOworICAgICAgICAgICAg ICAgICAgICBpZiAodmFsdWUuaXNCb29sZWFuKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gdmFsdWUuYXNCb29sZWFuKCkgPyBBU0NJSUxpdGVyYWwoInRydWUiKSA6IEFTQ0lJTGl0 ZXJhbCgiZmFsc2UiKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVlLmlzTnVsbCgpKQor ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibnVsbCIpOworICAg ICAgICAgICAgICAgICAgICBpZiAodmFsdWUuaXNVbmRlZmluZWQoKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInVuZGVmaW5lZCIpOworICAgICAgICAgICAg ICAgICAgICAvLyBGSVhNRTogbWF5YmUgZG8gbmljZSB0aGluZ3MgZm9yIFN5bWJvbHM/CisgICAg ICAgICAgICAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICB9OworCisg ICAgICAgICAgICAgICAgU3RyaW5nIGxlZnRTdHJpbmcgPSB0cnlHZXRDb25zdGFudChtX25vZGUt PmNoaWxkMSgpLm5vZGUoKSk7CisgICAgICAgICAgICAgICAgaWYgKCFsZWZ0U3RyaW5nKQorICAg ICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBTdHJpbmcgcmlnaHRTdHJp bmcgPSB0cnlHZXRDb25zdGFudChtX25vZGUtPmNoaWxkMigpLm5vZGUoKSk7CisgICAgICAgICAg ICAgICAgaWYgKCFyaWdodFN0cmluZykKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAg ICAgICAgICAgICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgICAgICAgICAgICAgYnVp bGRlci5hcHBlbmQobGVmdFN0cmluZyk7CisgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo cmlnaHRTdHJpbmcpOworICAgICAgICAgICAgICAgIG1fbm9kZS0+Y29udmVydFRvTGF6eUpTQ29u c3RhbnQoCisgICAgICAgICAgICAgICAgICAgIG1fZ3JhcGgsIExhenlKU1ZhbHVlOjpuZXdTdHJp bmcobV9ncmFwaCwgYnVpbGRlci50b1N0cmluZygpKSk7CisgICAgICAgICAgICAgICAgbV9jaGFu Z2VkID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CisKICAgICAgICAgY2FzZSBNYWtlUm9wZToKLSAgICAgICAgY2FzZSBWYWx1ZUFkZDoKICAgICAg ICAgY2FzZSBTdHJDYXQ6IHsKICAgICAgICAgICAgIFN0cmluZyBsZWZ0U3RyaW5nID0gbV9ub2Rl LT5jaGlsZDEoKS0+dHJ5R2V0U3RyaW5nKG1fZ3JhcGgpOwogICAgICAgICAgICAgaWYgKCFsZWZ0 U3RyaW5nKQo= 291112 2016-10-10 09:12:59 -0700 2016-10-10 19:42:34 -0700 WIP b-backup.diff text/plain 6738 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIu Y3BwCShyZXZpc2lvbiAyMDY5NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5 dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIzOSw3ICs0MjM5LDEyIEBAIGJv b2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAgICAgICBC eVZhbEluZm8qIGJ5VmFsSW5mbyA9IG1faW5saW5lU3RhY2tUb3AtPm1fYnlWYWxJbmZvcy5nZXQo Q29kZU9yaWdpbihjdXJyZW50Q29kZU9yaWdpbigpLmJ5dGVjb2RlSW5kZXgpKTsKICAgICAgICAg ICAgICAgICAvLyBGSVhNRTogV2hlbiB0aGUgYnl0ZWNvZGUgaXMgbm90IGNvbXBpbGVkIGluIHRo ZSBiYXNlbGluZSBKSVQsIGJ5VmFsSW5mbyBiZWNvbWVzIG51bGwuCiAgICAgICAgICAgICAgICAg Ly8gQXQgdGhhdCB0aW1lLCB0aGVyZSBpcyBubyBpbmZvcm1hdGlvbi4KLSAgICAgICAgICAgICAg ICBpZiAoYnlWYWxJbmZvICYmIGJ5VmFsSW5mby0+c3R1YkluZm8gJiYgIWJ5VmFsSW5mby0+dG9v a1Nsb3dQYXRoICYmICFtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRl KG1fY3VycmVudEluZGV4LCBCYWRJZGVudCkgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFBy b2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENlbGwpKSB7CisgICAgICAgICAg ICAgICAgaWYgKGJ5VmFsSW5mbyAKKyAgICAgICAgICAgICAgICAgICAgICAgICYmIGJ5VmFsSW5m by0+c3R1YkluZm8KKyAgICAgICAgICAgICAgICAgICAgICAgICYmICFieVZhbEluZm8tPnRvb2tT bG93UGF0aAorICAgICAgICAgICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1f ZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZElkZW50KQorICAgICAg ICAgICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFz RXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZFR5cGUpCisgICAgICAgICAgICAgICAgICAgICAg ICAmJiAhbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJl bnRJbmRleCwgQmFkQ2VsbCkpIHsKICAgICAgICAgICAgICAgICAgICAgY29tcGlsZWRBc1B1dEJ5 SWQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVy ID0gbV9ncmFwaC5pZGVudGlmaWVycygpLmVuc3VyZShieVZhbEluZm8tPmNhY2hlZElkLmltcGwo KSk7CiAgICAgICAgICAgICAgICAgICAgIFVuaXF1ZWRTdHJpbmdJbXBsKiB1aWQgPSBtX2dyYXBo LmlkZW50aWZpZXJzKClbaWRlbnRpZmllck51bWJlcl07CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0xhenlKU1ZhbHVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0xhenlKU1ZhbHVlLmNwcAkocmV2aXNpb24gMjA2OTY5KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdMYXp5SlNWYWx1ZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIxNiwyNSArMjE2LDM0IEBAIHZvaWQgTGF6eUpTVmFsdWU6OmVtaXQoQ0NhbGxIZWxwZXJz JiBqaXQKICAgICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKHN0YXRpY19jYXN0PHNp emVfdD4oMHhkMWU3YmVlZmx1KSksCiAgICAgICAgIHJlc3VsdC5wYXlsb2FkR1BSKCkpOwogCi0g ICAgTGF6eUpTVmFsdWUgdGhpc1ZhbHVlID0gKnRoaXM7CisgICAgTGF6eUpTVmFsdWUgX3RoaXNW YWx1ZSA9ICp0aGlzOwogCiAgICAgLy8gT25jZSB3ZSBkbyB0aGlzLCB3ZSdyZSBjb21taXR0ZWQu IE90aGVyd2lzZSB3ZSBsZWFrIG1lbW9yeS4gTm90ZSB0aGF0IHdlIGNhbGwgcmVmL2RlcmVmCiAg ICAgLy8gbWFudWFsbHkgdG8gZW5zdXJlIHRoYXQgdGhlcmUgaXMgbm8gY29uY3VycmVuY3kgc2hh ZGluZXNzLiBXZSBhcmUgZG9pbmcgc29tZXRoaW5nIGhlcmUKICAgICAvLyB0aGF0IG1pZ2h0IGJl IHJhdGhlciBicnV0YWw6IHRyYW5zZmVyaW5nIG93bmVyc2hpcCBvZiB0aGlzIHN0cmluZy4KICAg ICBpZiAobV9raW5kID09IE5ld1N0cmluZ0ltcGwpCi0gICAgICAgIHRoaXNWYWx1ZS51LnN0cmlu Z0ltcGwtPnJlZigpOworICAgICAgICBfdGhpc1ZhbHVlLnUuc3RyaW5nSW1wbC0+cmVmKCk7CiAK ICAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9IGppdC5jb2RlQmxvY2soKTsKICAgICAKICAgICBq aXQuYWRkTGlua1Rhc2soCi0gICAgICAgIFtjb2RlQmxvY2ssIGxhYmVsLCB0aGlzVmFsdWVdIChM aW5rQnVmZmVyJiBsaW5rQnVmZmVyKSB7CisgICAgICAgIFtjb2RlQmxvY2ssIGxhYmVsLCBfdGhp c1ZhbHVlXSAoTGlua0J1ZmZlciYgbGlua0J1ZmZlcikgeworICAgICAgICAgICAgTGF6eUpTVmFs dWUgdGhpc1ZhbHVlID0gX3RoaXNWYWx1ZTsKKyAgICAgICAgICAgIGlmICh0aGlzVmFsdWUubV9r aW5kID09IE5ld1N0cmluZ0ltcGwpIHsKKyAgICAgICAgICAgICAgICBBdG9taWNTdHJpbmcgcyA9 IEF0b21pY1N0cmluZyh0aGlzVmFsdWUudS5zdHJpbmdJbXBsKTsKKyAgICAgICAgICAgICAgICBS ZWZQdHI8QXRvbWljU3RyaW5nSW1wbD4gaW1wbCA9IHMuaW1wbCgpOworICAgICAgICAgICAgICAg IHRoaXNWYWx1ZS51LnN0cmluZ0ltcGwtPmRlcmVmKCk7CisgICAgICAgICAgICAgICAgdGhpc1Zh bHVlLnUuc3RyaW5nSW1wbCA9IGltcGwuZ2V0KCk7CisgICAgICAgICAgICAgICAgdGhpc1ZhbHVl LnUuc3RyaW5nSW1wbC0+cmVmKCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBKU1ZhbHVl IHJlYWxWYWx1ZSA9IHRoaXNWYWx1ZS5nZXRWYWx1ZShsaW5rQnVmZmVyLnZtKCkpOwogICAgICAg ICAgICAgUkVMRUFTRV9BU1NFUlQocmVhbFZhbHVlLmlzQ2VsbCgpKTsKIAogICAgICAgICAgICAg Y29kZUJsb2NrLT5hZGRDb25zdGFudChyZWFsVmFsdWUpOwogICAgICAgICAgICAgCi0gICAgICAg ICAgICBpZiAodGhpc1ZhbHVlLm1fa2luZCA9PSBOZXdTdHJpbmdJbXBsKQorICAgICAgICAgICAg aWYgKHRoaXNWYWx1ZS5tX2tpbmQgPT0gTmV3U3RyaW5nSW1wbCkgewogICAgICAgICAgICAgICAg IHRoaXNWYWx1ZS51LnN0cmluZ0ltcGwtPmRlcmVmKCk7CisgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIGxpbmtCdWZmZXIucGF0Y2gobGFiZWwsIHJlYWxWYWx1ZS5hc0NlbGwoKSk7CiAgICAg ICAgIH0pOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJlbmd0aFJlZHVj dGlvblBoYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1N0cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwCShyZXZpc2lvbiAyMDY5NjkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMjIsOCArMzIyLDQ3IEBAIHByaXZhdGU6CiAgICAgICAgIC8vIG1vdmUgdGhl c2UgdG8gdGhlIGFic3RyYWN0IGludGVycHJldGVyIG9uY2UgQWJzdHJhY3RWYWx1ZSBjYW4gc3Vw cG9ydCBMYXp5SlNWYWx1ZS4KICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NTIwNAogCisgICAgICAgIGNhc2UgVmFsdWVBZGQ6IHsKKyAgICAgICAg ICAgIGlmIChtX25vZGUtPmNoaWxkMSgpLT5pc0NvbnN0YW50KCkgJiYgbV9ub2RlLT5jaGlsZDIo KS0+aXNDb25zdGFudCgpICYmICghIW1fbm9kZS0+Y2hpbGQxKCktPnRyeUdldFN0cmluZyhtX2dy YXBoKSB8fCAhIW1fbm9kZS0+Y2hpbGQyKCktPnRyeUdldFN0cmluZyhtX2dyYXBoKSkpIHsKKyAg ICAgICAgICAgICAgICBhdXRvIHRyeUdldENvbnN0YW50ID0gWyZdIChOb2RlKiBub2RlKSAtPiBT dHJpbmcgeworICAgICAgICAgICAgICAgICAgICBTdHJpbmcgc3RyaW5nID0gbm9kZS0+dHJ5R2V0 U3RyaW5nKG1fZ3JhcGgpOworICAgICAgICAgICAgICAgICAgICBpZiAoIXN0cmluZy5pc0VtcHR5 KCkpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gc3RyaW5nOworICAgICAgICAgICAg ICAgICAgICBKU1ZhbHVlIHZhbHVlID0gbm9kZS0+Y29uc3RhbnQoKS0+dmFsdWUoKTsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKCF2YWx1ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVy biBTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVlLmlzSW50MzIoKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBTdHJpbmc6Om51bWJlcih2YWx1ZS5hc0ludDMy KCkpOworICAgICAgICAgICAgICAgICAgICBpZiAodmFsdWUuaXNOdW1iZXIoKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBTdHJpbmc6Om51bWJlclRvU3RyaW5nRUNNQVNjcmlwdCh2 YWx1ZS5hc051bWJlcigpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVlLmlzQm9vbGVh bigpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHZhbHVlLmFzQm9vbGVhbigpID8g QVNDSUlMaXRlcmFsKCJ0cnVlIikgOiBBU0NJSUxpdGVyYWwoImZhbHNlIik7CisgICAgICAgICAg ICAgICAgICAgIGlmICh2YWx1ZS5pc051bGwoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBBU0NJSUxpdGVyYWwoIm51bGwiKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVl LmlzVW5kZWZpbmVkKCkpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gQVNDSUlMaXRl cmFsKCJ1bmRlZmluZWQiKTsKKyAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IG1heWJlIGRv IG5pY2UgdGhpbmdzIGZvciBTeW1ib2xzPworICAgICAgICAgICAgICAgICAgICByZXR1cm4gU3Ry aW5nKCk7CisgICAgICAgICAgICAgICAgfTsKKworICAgICAgICAgICAgICAgIFN0cmluZyBsZWZ0 U3RyaW5nID0gdHJ5R2V0Q29uc3RhbnQobV9ub2RlLT5jaGlsZDEoKS5ub2RlKCkpOworICAgICAg ICAgICAgICAgIGlmICghbGVmdFN0cmluZykKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICAgICAgU3RyaW5nIHJpZ2h0U3RyaW5nID0gdHJ5R2V0Q29uc3RhbnQobV9ub2Rl LT5jaGlsZDIoKS5ub2RlKCkpOworICAgICAgICAgICAgICAgIGlmICghcmlnaHRTdHJpbmcpCisg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICAgICAgU3RyaW5nQnVpbGRl ciBidWlsZGVyOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGxlZnRTdHJpbmcpOwor ICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHJpZ2h0U3RyaW5nKTsKKyAgICAgICAgICAg ICAgICBtX25vZGUtPmNvbnZlcnRUb0xhenlKU0NvbnN0YW50KAorICAgICAgICAgICAgICAgICAg ICBtX2dyYXBoLCBMYXp5SlNWYWx1ZTo6bmV3U3RyaW5nKG1fZ3JhcGgsIGJ1aWxkZXIudG9TdHJp bmcoKSkpOworICAgICAgICAgICAgICAgIG1fY2hhbmdlZCA9IHRydWU7CisgICAgICAgICAgICB9 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCiAgICAgICAgIGNhc2UgTWFrZVJvcGU6 Ci0gICAgICAgIGNhc2UgVmFsdWVBZGQ6CiAgICAgICAgIGNhc2UgU3RyQ2F0OiB7CiAgICAgICAg ICAgICBTdHJpbmcgbGVmdFN0cmluZyA9IG1fbm9kZS0+Y2hpbGQxKCktPnRyeUdldFN0cmluZyht X2dyYXBoKTsKICAgICAgICAgICAgIGlmICghbGVmdFN0cmluZykKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDIwNjk2OSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjYwNiw4ICsyNjA2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXBpbGVD aGVja1N0cmluZ0lkZW50KCkKICAgICB7CiAgICAgICAgIFVuaXF1ZWRTdHJpbmdJbXBsKiB1aWQg PSBtX25vZGUtPnVpZE9wZXJhbmQoKTsKLSAgICAgICAgTFZhbHVlIHN0cmluZyA9IGxvd1N0cmlu Z0lkZW50KG1fbm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICBMVmFsdWUgc3RyaW5nSW1wbCA9IG1f b3V0LmxvYWRQdHIoc3RyaW5nLCBtX2hlYXBzLkpTU3RyaW5nX3ZhbHVlKTsKKyAgICAgICAgTFZh bHVlIHN0cmluZ0ltcGwgPSBsb3dTdHJpbmdJZGVudChtX25vZGUtPmNoaWxkMSgpKTsKKyAgICAg ICAgLy9MVmFsdWUgc3RyaW5nSW1wbCA9IG1fb3V0LmxvYWRQdHIoc3RyaW5nLCBtX2hlYXBzLkpT U3RyaW5nX3ZhbHVlKTsKICAgICAgICAgc3BlY3VsYXRlKEJhZElkZW50LCBub1ZhbHVlKCksIG51 bGxwdHIsIG1fb3V0Lm5vdEVxdWFsKHN0cmluZ0ltcGwsIG1fb3V0LmNvbnN0SW50UHRyKHVpZCkp KTsKICAgICB9CiAK 291215 2016-10-10 19:42:34 -0700 2016-10-11 03:17:30 -0700 patch b-backup.diff text/plain 8055 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDcwMzYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE2LTEwLTEwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIFZhbHVlQWRkIHNob3VsZCBiZSBjb25zdGFudCBmb2xkZWQgaWYgdGhl IG9wZXJhbmRzIGFyZSBjb25zdGFudCBTdHJpbmcsUHJpbWl0aXZlIG9yIFByaW1pdGl2ZSxTdHJp bmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzE4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWlj cm9iZW5jaG1hcmtzL3N0cmluZy1hZGQtY29uc3RhbnQtZm9sZGluZy5qczogQWRkZWQuCisgICAg ICAgIChhc3NlcnQpOgorICAgICAgICAocnVuVGVzdHMpOgorICAgICAgICAoYWRkKToKKyAgICAg ICAgKHRlc3QpOgorCiAyMDE2LTEwLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4K IAogICAgICAgICBPYmplY3QuZnJlZXplKCkgYW5kIHNlYWwoKSBzaG91bGQgdGhyb3cgaWYgW1tQ cmV2ZW50RXh0ZW5zaW9uc11dKCkgZmFpbHMuCkluZGV4OiBKU1Rlc3RzL21pY3JvYmVuY2htYXJr cy9zdHJpbmctYWRkLWNvbnN0YW50LWZvbGRpbmcuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9t aWNyb2JlbmNobWFya3Mvc3RyaW5nLWFkZC1jb25zdGFudC1mb2xkaW5nLmpzCShub25leGlzdGVu dCkKKysrIEpTVGVzdHMvbWljcm9iZW5jaG1hcmtzL3N0cmluZy1hZGQtY29uc3RhbnQtZm9sZGlu Zy5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDY4IEBACitmdW5jdGlvbiBhc3NlcnQoYikg eworICAgIGlmICghYikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQgYXNzZXJ0aW9uLiIp OworfQorCitsZXQgdGVzdHMgPSBbXTsKK2Z1bmN0aW9uIHRlc3QoZikgeworICAgIG5vSW5saW5l KGYpOworICAgIHRlc3RzLnB1c2goZik7Cit9CisKK2Z1bmN0aW9uIHJ1blRlc3RzKCkgeworICAg IGxldCBzdGFydCA9IERhdGUubm93KCk7CisgICAgZm9yIChsZXQgZiBvZiB0ZXN0cykgeworICAg ICAgICBmb3IgKGxldCBpID0gMDsgaSA8IDQwMDAwOyBpKyspCisgICAgICAgICAgICBmKCk7Cisg ICAgfQorICAgIGNvbnN0IHZlcmJvc2UgPSBmYWxzZTsKKyAgICBpZiAodmVyYm9zZSkKKyAgICAg ICAgcHJpbnQoRGF0ZS5ub3coKSAtIHN0YXJ0KTsKK30KKworZnVuY3Rpb24gYWRkKGEsYikgeyBy ZXR1cm4gYSArIGI7IH0KK25vSW5saW5lKGFkZCk7CisKK3Rlc3QoZnVuY3Rpb24oKSB7CisgICAg bGV0IGEgPSAiZm9vIjsKKyAgICBsZXQgYiA9IDIwOworICAgIGFzc2VydChhICsgYiA9PT0gYWRk KGEsIGIpKTsKKyAgICBhc3NlcnQoYiArIGEgPT09IGFkZChiLCBhKSk7Cit9KTsKKwordGVzdChm dW5jdGlvbigpIHsKKyAgICBsZXQgYSA9ICJmb28iOworICAgIGxldCBiID0gbnVsbDsKKyAgICBh c3NlcnQoYSArIGIgPT09IGFkZChhLCBiKSk7CisgICAgYXNzZXJ0KGIgKyBhID09PSBhZGQoYiwg YSkpOworfSk7CisKK3Rlc3QoZnVuY3Rpb24oKSB7CisgICAgbGV0IGEgPSAiZm9vIjsKKyAgICBs ZXQgYiA9IHVuZGVmaW5lZDsKKyAgICBhc3NlcnQoYSArIGIgPT09IGFkZChhLCBiKSk7CisgICAg YXNzZXJ0KGIgKyBhID09PSBhZGQoYiwgYSkpOworfSk7CisKK3Rlc3QoZnVuY3Rpb24oKSB7Cisg ICAgbGV0IGEgPSAiZm9vIjsKKyAgICBsZXQgYiA9IDIwLjgxMjM5MDEyODIxOworICAgIGFzc2Vy dChhICsgYiA9PT0gYWRkKGEsIGIpKTsKKyAgICBhc3NlcnQoYiArIGEgPT09IGFkZChiLCBhKSk7 Cit9KTsKKwordGVzdChmdW5jdGlvbigpIHsKKyAgICBsZXQgYSA9ICJmb28iOworICAgIGxldCBi ID0gdHJ1ZTsKKyAgICBhc3NlcnQoYSArIGIgPT09IGFkZChhLCBiKSk7CisgICAgYXNzZXJ0KGIg KyBhID09PSBhZGQoYiwgYSkpOworfSk7CisKK3Rlc3QoZnVuY3Rpb24oKSB7CisgICAgbGV0IGEg PSAiZm9vIjsKKyAgICBsZXQgYiA9IGZhbHNlOworICAgIGFzc2VydChhICsgYiA9PT0gYWRkKGEs IGIpKTsKKyAgICBhc3NlcnQoYiArIGEgPT09IGFkZChiLCBhKSk7Cit9KTsKKworcnVuVGVzdHMo KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MDM1KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIx IEBACisyMDE2LTEwLTEwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAg ICAgIFZhbHVlQWRkIHNob3VsZCBiZSBjb25zdGFudCBmb2xkZWQgaWYgdGhlIG9wZXJhbmRzIGFy ZSBjb25zdGFudCBTdHJpbmcsUHJpbWl0aXZlIG9yIFByaW1pdGl2ZSxTdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzE4MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY29kZSBwYXR0ZXJu IHNob3dzIHVwIGluIERyb21hZW8sIHNvIGl0J3Mgd29ydGggb3B0aW1pemluZyBmb3IuCisgICAg ICAgIFRoaXMgbWlnaHQgYWxzbyBzaG93IHVwIGluIHJlYWwgd29ybGQgSlMgY29kZSBkdWUgdG8g aW5saW5pbmcgYW5kIG90aGVyCisgICAgICAgIHR5cGVzIG9mIGNvbnN0YW50IGZvbGRpbmcuCisK KyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6 OkJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKToKKyAgICAgICAgKiBkZmcvREZHTGF6eUpTVmFs dWUuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkxhenlKU1ZhbHVlOjpnZXRWYWx1ZSk6CisgICAg ICAgICogZGZnL0RGR1N0cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlN0cmVuZ3RoUmVkdWN0aW9uUGhhc2U6OmhhbmRsZU5vZGUpOgorCiAyMDE2LTEwLTEwICBN YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgdGhlIFN0cmlj dE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvciBzdHJpbmcgdG8gUmVhZG9ubHlQcm9wZXJ0 eVdyaXRlRXJyb3IuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2Rl UGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5 dGVDb2RlUGFyc2VyLmNwcAkocmV2aXNpb24gMjA3MDM1KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMzksNyAr NDIzOSwxMiBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAg ICAgICAgICAgICAgQnlWYWxJbmZvKiBieVZhbEluZm8gPSBtX2lubGluZVN0YWNrVG9wLT5tX2J5 VmFsSW5mb3MuZ2V0KENvZGVPcmlnaW4oY3VycmVudENvZGVPcmlnaW4oKS5ieXRlY29kZUluZGV4 KSk7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFdoZW4gdGhlIGJ5dGVjb2RlIGlzIG5vdCBj b21waWxlZCBpbiB0aGUgYmFzZWxpbmUgSklULCBieVZhbEluZm8gYmVjb21lcyBudWxsLgogICAg ICAgICAgICAgICAgIC8vIEF0IHRoYXQgdGltZSwgdGhlcmUgaXMgbm8gaW5mb3JtYXRpb24uCi0g ICAgICAgICAgICAgICAgaWYgKGJ5VmFsSW5mbyAmJiBieVZhbEluZm8tPnN0dWJJbmZvICYmICFi eVZhbEluZm8tPnRvb2tTbG93UGF0aCAmJiAhbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmls ZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkSWRlbnQpICYmICFtX2lubGluZVN0YWNr VG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRDZWxsKSkg eworICAgICAgICAgICAgICAgIGlmIChieVZhbEluZm8gCisgICAgICAgICAgICAgICAgICAgICYm IGJ5VmFsSW5mby0+c3R1YkluZm8KKyAgICAgICAgICAgICAgICAgICAgJiYgIWJ5VmFsSW5mby0+ dG9va1Nsb3dQYXRoCisgICAgICAgICAgICAgICAgICAgICYmICFtX2lubGluZVN0YWNrVG9wLT5t X2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRJZGVudCkKKyAgICAg ICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhp dFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZFR5cGUpCisgICAgICAgICAgICAgICAgICAgICYmICFt X2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4 LCBCYWRDZWxsKSkgewogICAgICAgICAgICAgICAgICAgICBjb21waWxlZEFzUHV0QnlJZCA9IHRy dWU7CiAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGlkZW50aWZpZXJOdW1iZXIgPSBtX2dy YXBoLmlkZW50aWZpZXJzKCkuZW5zdXJlKGJ5VmFsSW5mby0+Y2FjaGVkSWQuaW1wbCgpKTsKICAg ICAgICAgICAgICAgICAgICAgVW5pcXVlZFN0cmluZ0ltcGwqIHVpZCA9IG1fZ3JhcGguaWRlbnRp ZmllcnMoKVtpZGVudGlmaWVyTnVtYmVyXTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHTGF6eUpTVmFsdWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHTGF6eUpTVmFsdWUuY3BwCShyZXZpc2lvbiAyMDcwMzUpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0xhenlKU1ZhbHVlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEs OCArNTEsOSBAQCBKU1ZhbHVlIExhenlKU1ZhbHVlOjpnZXRWYWx1ZShWTSYgdm0pIGNvCiAgICAg Y2FzZSBTaW5nbGVDaGFyYWN0ZXJTdHJpbmc6CiAgICAgICAgIHJldHVybiBqc1NpbmdsZUNoYXJh Y3RlclN0cmluZygmdm0sIHUuY2hhcmFjdGVyKTsKICAgICBjYXNlIEtub3duU3RyaW5nSW1wbDoK LSAgICBjYXNlIE5ld1N0cmluZ0ltcGw6CiAgICAgICAgIHJldHVybiBqc1N0cmluZygmdm0sIHUu c3RyaW5nSW1wbCk7CisgICAgY2FzZSBOZXdTdHJpbmdJbXBsOgorICAgICAgICByZXR1cm4ganNT dHJpbmcoJnZtLCBBdG9taWNTdHJpbmdJbXBsOjphZGQodS5zdHJpbmdJbXBsKSk7CiAgICAgfQog ICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIEpTVmFsdWUoKTsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFz ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJlbmd0 aFJlZHVjdGlvblBoYXNlLmNwcAkocmV2aXNpb24gMjA3MDM1KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTdHJlbmd0aFJlZHVjdGlvblBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzIyLDggKzMyMiw0OCBAQCBwcml2YXRlOgogICAgICAgICAvLyBtb3ZlIHRoZXNlIHRvIHRo ZSBhYnN0cmFjdCBpbnRlcnByZXRlciBvbmNlIEFic3RyYWN0VmFsdWUgY2FuIHN1cHBvcnQgTGF6 eUpTVmFsdWUuCiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTUyMDQKIAorICAgICAgICBjYXNlIFZhbHVlQWRkOiB7CisgICAgICAgICAgICBpZiAo bV9ub2RlLT5jaGlsZDEoKS0+aXNDb25zdGFudCgpCisgICAgICAgICAgICAgICAgJiYgbV9ub2Rl LT5jaGlsZDIoKS0+aXNDb25zdGFudCgpCisgICAgICAgICAgICAgICAgJiYgKCEhbV9ub2RlLT5j aGlsZDEoKS0+dHJ5R2V0U3RyaW5nKG1fZ3JhcGgpIHx8ICEhbV9ub2RlLT5jaGlsZDIoKS0+dHJ5 R2V0U3RyaW5nKG1fZ3JhcGgpKSkgeworICAgICAgICAgICAgICAgIGF1dG8gdHJ5R2V0Q29uc3Rh bnRTdHJpbmcgPSBbJl0gKE5vZGUqIG5vZGUpIC0+IFN0cmluZyB7CisgICAgICAgICAgICAgICAg ICAgIFN0cmluZyBzdHJpbmcgPSBub2RlLT50cnlHZXRTdHJpbmcobV9ncmFwaCk7CisgICAgICAg ICAgICAgICAgICAgIGlmICghc3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBzdHJpbmc7CisgICAgICAgICAgICAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBu b2RlLT5jb25zdGFudCgpLT52YWx1ZSgpOworICAgICAgICAgICAgICAgICAgICBpZiAoIXZhbHVl KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICAgICAg ICAgICAgICBpZiAodmFsdWUuaXNJbnQzMigpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIFN0cmluZzo6bnVtYmVyKHZhbHVlLmFzSW50MzIoKSk7CisgICAgICAgICAgICAgICAgICAg IGlmICh2YWx1ZS5pc051bWJlcigpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0 cmluZzo6bnVtYmVyVG9TdHJpbmdFQ01BU2NyaXB0KHZhbHVlLmFzTnVtYmVyKCkpOworICAgICAg ICAgICAgICAgICAgICBpZiAodmFsdWUuaXNCb29sZWFuKCkpCisgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm4gdmFsdWUuYXNCb29sZWFuKCkgPyBBU0NJSUxpdGVyYWwoInRydWUiKSA6IEFT Q0lJTGl0ZXJhbCgiZmFsc2UiKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbHVlLmlzTnVs bCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibnVsbCIp OworICAgICAgICAgICAgICAgICAgICBpZiAodmFsdWUuaXNVbmRlZmluZWQoKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInVuZGVmaW5lZCIpOworICAgICAg ICAgICAgICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgICAgICAgICAgICAgfTsKKworICAg ICAgICAgICAgICAgIFN0cmluZyBsZWZ0U3RyaW5nID0gdHJ5R2V0Q29uc3RhbnRTdHJpbmcobV9u b2RlLT5jaGlsZDEoKS5ub2RlKCkpOworICAgICAgICAgICAgICAgIGlmICghbGVmdFN0cmluZykK KyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgU3RyaW5nIHJpZ2h0 U3RyaW5nID0gdHJ5R2V0Q29uc3RhbnRTdHJpbmcobV9ub2RlLT5jaGlsZDIoKS5ub2RlKCkpOwor ICAgICAgICAgICAgICAgIGlmICghcmlnaHRTdHJpbmcpCisgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgICAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKGxlZnRTdHJpbmcpOworICAgICAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kKHJpZ2h0U3RyaW5nKTsKKyAgICAgICAgICAgICAgICBtX25vZGUtPmNvbnZlcnRU b0xhenlKU0NvbnN0YW50KAorICAgICAgICAgICAgICAgICAgICBtX2dyYXBoLCBMYXp5SlNWYWx1 ZTo6bmV3U3RyaW5nKG1fZ3JhcGgsIGJ1aWxkZXIudG9TdHJpbmcoKSkpOworICAgICAgICAgICAg ICAgIG1fY2hhbmdlZCA9IHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgfQorCiAgICAgICAgIGNhc2UgTWFrZVJvcGU6Ci0gICAgICAgIGNhc2UgVmFsdWVB ZGQ6CiAgICAgICAgIGNhc2UgU3RyQ2F0OiB7CiAgICAgICAgICAgICBTdHJpbmcgbGVmdFN0cmlu ZyA9IG1fbm9kZS0+Y2hpbGQxKCktPnRyeUdldFN0cmluZyhtX2dyYXBoKTsKICAgICAgICAgICAg IGlmICghbGVmdFN0cmluZykK 291245 2016-10-11 03:17:45 -0700 2016-10-11 03:19:36 -0700 Patch for landing bug-163182-20161011121422.patch text/plain 28 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MDYwCg==