134695 2014-07-07 14:53:43 -0700 add css jit profiler 2014-07-09 10:51:22 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 134749 1 achristensen achristensen allan.jensen benjamin commit-queue esprehn+autocc glenn gyuyoung.kim kangil.han macpherson menard oldest_to_newest 1020913 0 achristensen 2014-07-07 14:53:43 -0700 Profiling the css jit compiler is useful to know where we need to improve. 1020914 1 234513 achristensen 2014-07-07 14:54:27 -0700 Created attachment 234513 Patch 1020927 2 234519 achristensen 2014-07-07 15:25:45 -0700 Created attachment 234519 Patch 1021201 3 234519 commit-queue 2014-07-08 14:48:18 -0700 Comment on attachment 234519 Patch Clearing flags on attachment: 234519 Committed r170894: <http://trac.webkit.org/changeset/170894> 1021202 4 commit-queue 2014-07-08 14:48:22 -0700 All reviewed patches have been landed. Closing bug. 1021254 5 commit-queue 2014-07-08 17:41:30 -0700 Re-opened since this is blocked by bug 134749 1021292 6 234519 achristensen 2014-07-08 22:40:45 -0700 Comment on attachment 234519 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234519&action=review > Source/WebCore/cssjit/SelectorCompiler.h:34 > +#define CSS_SELECTOR_JIT_PROFILING 1 Here's the problem. This should be 0. I'll recommit this tomorrow with 0 and watch the bots. 1021394 7 234519 achristensen 2014-07-09 10:45:27 -0700 Comment on attachment 234519 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234519&action=review > Source/WebCore/css/RuleSet.cpp:143 > +#if CSS_SELECTOR_JIT_PROFILING Ah, this should be ENABLE(CSS_SELECTOR_JIT) && CSS_SELECTOR_JIT_PROFILING > Source/WebCore/dom/SelectorQuery.h:59 > +#if CSS_SELECTOR_JIT_PROFILING this, too. 1021398 8 achristensen 2014-07-09 10:51:22 -0700 Re-committed to http://trac.webkit.org/changeset/170921 and watching bots... 234513 2014-07-07 14:54:27 -0700 2014-07-07 15:25:41 -0700 Patch bug-134695-20140707145409.patch text/plain 9280 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDg1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE0LTA3LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkZWQgY3Nz IGppdCBwcm9maWxlciwgZGlzYWJsZWQgYnkgZGVmYXVsdC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDY5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjpydWxlTWF0Y2hlcyk6 CisgICAgICAgIFRlbGwgdGhlIFJ1bGVEYXRhIHdoZW4gaXRzIGNvbXBpbGVkIHNlbGVjdG9yIGlz IHVzZWQuCisgICAgICAgICogY3NzL1J1bGVTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UnVs ZURhdGE6OlJ1bGVEYXRhKToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgY29tcGlsZWQgc2VsZWN0 b3IgdXNlIGNvdW50IHRvIDAuCisgICAgICAgICogY3NzL1J1bGVTZXQuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJ1bGVEYXRhOjp+UnVsZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UnVsZURhdGE6 OmNvbXBpbGVkU2VsZWN0b3JVc2VkKToKKyAgICAgICAgQ291bnQgYW5kIGxvZyB0aGUgbnVtYmVy IG9mIHRpbWVzIGEgY29tcGlsZWQgc2VsZWN0b3IgaXMgdXNlZC4KKyAgICAgICAgKiBjc3NqaXQv U2VsZWN0b3JDb21waWxlci5oOgorICAgICAgICBBZGRlZCBvcHRpb24gZm9yIENTU19TRUxFQ1RP Ul9KSVRfUFJPRklMSU5HIHNldCB0byAwIGJ5IGRlZmF1bHQuCisgICAgICAgICogZG9tL1NlbGVj dG9yUXVlcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0 ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVj dG9yRGF0YUxpc3Q6OmV4ZWN1dGUpOgorICAgICAgICBUZWxsIHRoZSBTZWxlY3RvckRhdGEgd2hl biBpdHMgY29tcGlsZWQgc2VsZWN0b3IgaXMgdXNlZC4KKyAgICAgICAgKiBkb20vU2VsZWN0b3JR dWVyeS5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6U2VsZWN0b3JEYXRh OjpTZWxlY3RvckRhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6U2Vs ZWN0b3JEYXRhOjp+U2VsZWN0b3JEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0 YUxpc3Q6OlNlbGVjdG9yRGF0YTo6Y29tcGlsZWRTZWxlY3RvclVzZWQpOgorICAgICAgICBDb3Vu dCBhbmQgbG9nIHRoZSBudW1iZXIgb2YgdGltZXMgYSBjb21waWxlZCBzZWxlY3RvciBpcyB1c2Vk LgorCiAyMDE0LTA3LTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW2lPUyBXZWJHTF0gRml4IGNyYXNoIHdpdGggdG9vIG1hbnkgbmVzdGVk IGdsc2wgZnVuY3Rpb25zLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29s bGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVD b2xsZWN0b3IuY3BwCShyZXZpc2lvbiAxNzA4NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvRWxl bWVudFJ1bGVDb2xsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsNiArMzAzLDkgQEAg aW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYQogCiAgICAgICAgIGlmIChy dWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6 OlNpbXBsZVNlbGVjdG9yQ2hlY2tlcikgewogICAgICAgICAgICAgU2VsZWN0b3JDb21waWxlcjo6 U2ltcGxlU2VsZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlciA9IFNlbGVjdG9yQ29tcGlsZXI6 OnNpbXBsZVNlbGVjdG9yQ2hlY2tlckZ1bmN0aW9uKGNvbXBpbGVkU2VsZWN0b3JDaGVja2VyLCBy dWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpKTsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJ TElORworICAgICAgICAgICAgcnVsZURhdGEuY29tcGlsZWRTZWxlY3RvclVzZWQoKTsKKyNlbmRp ZgogICAgICAgICAgICAgcmV0dXJuIHNlbGVjdG9yQ2hlY2tlcigmbV9lbGVtZW50KTsKICAgICAg ICAgfQogICAgICAgICBBU1NFUlQocnVsZURhdGEuY29tcGlsYXRpb25TdGF0dXMoKSA9PSBTZWxl Y3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0 KTsKQEAgLTMxMSw2ICszMTQsOSBAQCBpbmxpbmUgYm9vbCBFbGVtZW50UnVsZUNvbGxlY3Rvcjo6 cnVsZU1hCiAgICAgICAgIFNlbGVjdG9yQ29tcGlsZXI6OkNoZWNraW5nQ29udGV4dCBjb250ZXh0 OwogICAgICAgICBjb250ZXh0LmVsZW1lbnRTdHlsZSA9IG1fc3R5bGU7CiAgICAgICAgIGNvbnRl eHQucmVzb2x2aW5nTW9kZSA9IG1fbW9kZTsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElO RworICAgICAgICBydWxlRGF0YS5jb21waWxlZFNlbGVjdG9yVXNlZCgpOworI2VuZGlmCiAgICAg ICAgIHJldHVybiBzZWxlY3RvckNoZWNrZXIoJm1fZWxlbWVudCwgJmNvbnRleHQpOwogICAgIH0K ICNlbmRpZiAvLyBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9SdWxlU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNl dC5jcHAJKHJldmlzaW9uIDE3MDg0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTQwLDYgKzE0MCw5IEBAIFJ1bGVEYXRhOjpSdWxlRGF0YShT dHlsZVJ1bGUqIHJ1bGUsIHVuc2kKICAgICAsIG1fbGlua01hdGNoVHlwZShTZWxlY3RvckNoZWNr ZXI6OmRldGVybWluZUxpbmtNYXRjaFR5cGUoc2VsZWN0b3IoKSkpCiAgICAgLCBtX2hhc0RvY3Vt ZW50U2VjdXJpdHlPcmlnaW4oYWRkUnVsZUZsYWdzICYgUnVsZUhhc0RvY3VtZW50U2VjdXJpdHlP cmlnaW4pCiAgICAgLCBtX3Byb3BlcnR5V2hpdGVsaXN0VHlwZShkZXRlcm1pbmVQcm9wZXJ0eVdo aXRlbGlzdFR5cGUoYWRkUnVsZUZsYWdzLCBzZWxlY3RvcigpKSkKKyNpZiBDU1NfU0VMRUNUT1Jf SklUX1BST0ZJTElORworICAgICwgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291bnQoMCkKKyNlbmRp ZgogewogICAgIEFTU0VSVChtX3Bvc2l0aW9uID09IHBvc2l0aW9uKTsKICAgICBBU1NFUlQobV9z ZWxlY3RvckluZGV4ID09IHNlbGVjdG9ySW5kZXgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L1J1bGVTZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCShy ZXZpc2lvbiAxNzA4NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNs dWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5oPgor I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC04NSw2ICs4NiwxNSBAQCBwdWJsaWM6CiAgICAgICAgIG1fY29tcGlsYXRpb25TdGF0dXMgPSBz dGF0dXM7CiAgICAgICAgIG1fY29tcGlsZWRTZWxlY3RvckNvZGVSZWYgPSBjb2RlUmVmOwogICAg IH0KKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgIH5SdWxlRGF0YSgpCisgICAg eworICAgICAgICBpZiAobV9jb21waWxlZFNlbGVjdG9yQ29kZVJlZi5jb2RlKCkuZXhlY3V0YWJs ZUFkZHJlc3MoKSkKKyAgICAgICAgICAgIGRhdGFMb2dGKCJSdWxlRGF0YSBjb21waWxlZCBzZWxl Y3RvciAlZCBcIiVzXCIiLCBtX2NvbXBpbGVkU2VsZWN0b3JVc2VDb3VudCwgc2VsZWN0b3IoKS0+ c2VsZWN0b3JUZXh0KCkudXRmOCgpLmRhdGEoKSk7CisgICAgfQorICAgIG11dGFibGUgdW5zaWdu ZWQgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291bnQ7CisgICAgdm9pZCBjb21waWxlZFNlbGVjdG9y VXNlZCgpIGNvbnN0IHsgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291bnQrKzsgfQorI2VuZGlmCiAj ZW5kaWYgLy8gRU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiAKIHByaXZhdGU6CkBAIC0xMTQsNiAr MTI0LDkgQEAgc3RydWN0IFNhbWVTaXplQXNSdWxlRGF0YSB7CiAgICAgdW5zaWduZWQgY29tcGls YXRpb25TdGF0dXM7CiAgICAgdm9pZCogY29tcGlsZWRTZWxlY3RvclBvaW50ZXI7CiAgICAgdm9p ZCogY29kZVJlZlB0cjsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgIHVuc2ln bmVkIGNvbXBpbGVkU2VsZWN0b3JVc2VDb3VudDsKKyNlbmRpZgogI2VuZGlmIC8vIEVOQUJMRShD U1NfU0VMRUNUT1JfSklUKQogCiAgICAgdm9pZCogYTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz c2ppdC9TZWxlY3RvckNvbXBpbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3Nz aml0L1NlbGVjdG9yQ29tcGlsZXIuaAkocmV2aXNpb24gMTcwODQ5KQorKysgU291cmNlL1dlYkNv cmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEs OCBAQAogI2luY2x1ZGUgIlNlbGVjdG9yQ2hlY2tlci5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRD b3JlL01hY3JvQXNzZW1ibGVyQ29kZVJlZi5oPgogCisjZGVmaW5lIENTU19TRUxFQ1RPUl9KSVRf UFJPRklMSU5HIDAKKwogbmFtZXNwYWNlIEpTQyB7CiBjbGFzcyBNYWNyb0Fzc2VtYmxlckNvZGVS ZWY7CiBjbGFzcyBWTTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAJKHJl dmlzaW9uIDE3MDg0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzYxLDkgKzM2MSwxNCBAQCBBTFdBWVNfSU5MSU5FIHZvaWQgU2Vs ZWN0b3JEYXRhTGlzdDo6ZXhlCiAKICNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKIHRlbXBs YXRlIDx0eXBlbmFtZSBTZWxlY3RvclF1ZXJ5VHJhaXQ+Ci1BTFdBWVNfSU5MSU5FIHZvaWQgU2Vs ZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKGNvbnN0 IENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBTZWxlY3RvckNvbXBpbGVyOjpTaW1wbGVTZWxlY3Rv ckNoZWNrZXIgc2VsZWN0b3JDaGVja2VyLCB0eXBlbmFtZSBTZWxlY3RvclF1ZXJ5VHJhaXQ6Ok91 dHB1dFR5cGUmIG91dHB1dCkgY29uc3QKK0FMV0FZU19JTkxJTkUgdm9pZCBTZWxlY3RvckRhdGFM aXN0OjpleGVjdXRlQ29tcGlsZWRTaW1wbGVTZWxlY3RvckNoZWNrZXIoY29uc3QgQ29udGFpbmVy Tm9kZSYgcm9vdE5vZGUsIFNlbGVjdG9yQ29tcGlsZXI6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlciBz ZWxlY3RvckNoZWNrZXIsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlUcmFpdDo6T3V0cHV0VHlwZSYg b3V0cHV0LCBjb25zdCBTZWxlY3RvckRhdGEmIHNlbGVjdG9yRGF0YSkgY29uc3QKIHsKICAgICBm b3IgKGF1dG8mIGVsZW1lbnQgOiBlbGVtZW50RGVzY2VuZGFudHMoY29uc3RfY2FzdDxDb250YWlu ZXJOb2RlJj4ocm9vdE5vZGUpKSkgeworI2lmIENTU19TRUxFQ1RPUl9KSVRfUFJPRklMSU5HCisg ICAgICAgIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVjdG9yVXNlZCgpOworI2Vsc2UKKyAgICAg ICAgVU5VU0VEX1BBUkFNKHNlbGVjdG9yRGF0YSk7CisjZW5kaWYKICAgICAgICAgaWYgKHNlbGVj dG9yQ2hlY2tlcigmZWxlbWVudCkpIHsKICAgICAgICAgICAgIFNlbGVjdG9yUXVlcnlUcmFpdDo6 YXBwZW5kT3V0cHV0Rm9yRWxlbWVudChvdXRwdXQsICZlbGVtZW50KTsKICAgICAgICAgICAgIGlm IChTZWxlY3RvclF1ZXJ5VHJhaXQ6OnNob3VsZE9ubHlNYXRjaEZpcnN0RWxlbWVudCkKQEAgLTQz NSw3ICs0NDAsNyBAQCBBTFdBWVNfSU5MSU5FIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlCiAg ICAgICAgIGNvbnN0IFNlbGVjdG9yRGF0YSYgc2VsZWN0b3JEYXRhID0gbV9zZWxlY3RvcnMuZmly c3QoKTsKICAgICAgICAgdm9pZCogY29tcGlsZWRTZWxlY3RvckNoZWNrZXIgPSBzZWxlY3RvckRh dGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAg ICAgICAgIFNlbGVjdG9yQ29tcGlsZXI6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlciBzZWxlY3RvckNo ZWNrZXIgPSBTZWxlY3RvckNvbXBpbGVyOjpzaW1wbGVTZWxlY3RvckNoZWNrZXJGdW5jdGlvbihj b21waWxlZFNlbGVjdG9yQ2hlY2tlciwgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzKTsK LSAgICAgICAgZXhlY3V0ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyPFNlbGVjdG9yUXVl cnlUcmFpdD4oKnNlYXJjaFJvb3ROb2RlLCBzZWxlY3RvckNoZWNrZXIsIG91dHB1dCk7CisgICAg ICAgIGV4ZWN1dGVDb21waWxlZFNpbXBsZVNlbGVjdG9yQ2hlY2tlcjxTZWxlY3RvclF1ZXJ5VHJh aXQ+KCpzZWFyY2hSb290Tm9kZSwgc2VsZWN0b3JDaGVja2VyLCBvdXRwdXQsIHNlbGVjdG9yRGF0 YSk7CiAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAjZWxzZQpJbmRleDogU291cmNlL1dlYkNv cmUvZG9tL1NlbGVjdG9yUXVlcnkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5oCShyZXZpc2lvbiAxNzA4NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVk ZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvQXRvbWljU3RyaW5nSGFzaC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC01NSwxMCArNTYsMjIgQEAgcHJpdmF0ZToKICAg ICBzdHJ1Y3QgU2VsZWN0b3JEYXRhIHsKICAgICAgICAgU2VsZWN0b3JEYXRhKGNvbnN0IENTU1Nl bGVjdG9yKiBzZWxlY3RvciwgYm9vbCBpc0Zhc3RDaGVja2FibGUpCiAgICAgICAgICAgICA6IHNl bGVjdG9yKHNlbGVjdG9yKQorI2lmIENTU19TRUxFQ1RPUl9KSVRfUFJPRklMSU5HCisgICAgICAg ICAgICAsIG1fY29tcGlsZWRTZWxlY3RvclVzZUNvdW50KDApCisjZW5kaWYKICAgICAgICAgICAg ICwgaXNGYXN0Q2hlY2thYmxlKGlzRmFzdENoZWNrYWJsZSkKICAgICAgICAgewogICAgICAgICB9 CiAKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgICAgICB+U2VsZWN0b3JEYXRh KCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmLmNv ZGUoKS5leGVjdXRhYmxlQWRkcmVzcygpKQorICAgICAgICAgICAgICAgIGRhdGFMb2dGKCJTZWxl Y3RvckRhdGEgY29tcGlsZWQgc2VsZWN0b3IgJWQgXCIlc1wiIiwgbV9jb21waWxlZFNlbGVjdG9y VXNlQ291bnQsIHNlbGVjdG9yLT5zZWxlY3RvclRleHQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAg ICAgfQorICAgICAgICBtdXRhYmxlIHVuc2lnbmVkIG1fY29tcGlsZWRTZWxlY3RvclVzZUNvdW50 OworICAgICAgICB2b2lkIGNvbXBpbGVkU2VsZWN0b3JVc2VkKCkgY29uc3QgeyBtX2NvbXBpbGVk U2VsZWN0b3JVc2VDb3VudCsrOyB9CisjZW5kaWYKICAgICAgICAgY29uc3QgQ1NTU2VsZWN0b3Iq IHNlbGVjdG9yOwogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JfSklUKQogICAgICAgICBtdXRhYmxl IEpTQzo6TWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmOwpAQCAt NzYsNyArODksNyBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBTZWxlY3RvclF1 ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZVNpbmdsZVNlbGVjdG9yRGF0YShjb25zdCBDb250YWluZXJO b2RlJiByb290Tm9kZSwgY29uc3QgU2VsZWN0b3JEYXRhJiwgdHlwZW5hbWUgU2VsZWN0b3JRdWVy eVRyYWl0OjpPdXRwdXRUeXBlJikgY29uc3Q7CiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFNlbGVj dG9yUXVlcnlUcmFpdD4gdm9pZCBleGVjdXRlU2luZ2xlTXVsdGlTZWxlY3RvckRhdGEoY29uc3Qg Q29udGFpbmVyTm9kZSYgcm9vdE5vZGUsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlUcmFpdDo6T3V0 cHV0VHlwZSYpIGNvbnN0OwogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JfSklUKQotICAgIHRlbXBs YXRlIDx0eXBlbmFtZSBTZWxlY3RvclF1ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZUNvbXBpbGVkU2lt cGxlU2VsZWN0b3JDaGVja2VyKGNvbnN0IENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBTZWxlY3Rv ckNvbXBpbGVyOjpTaW1wbGVTZWxlY3RvckNoZWNrZXIsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlU cmFpdDo6T3V0cHV0VHlwZSYpIGNvbnN0OworICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBTZWxlY3Rv clF1ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKGNv bnN0IENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBTZWxlY3RvckNvbXBpbGVyOjpTaW1wbGVTZWxl Y3RvckNoZWNrZXIsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlUcmFpdDo6T3V0cHV0VHlwZSYsIGNv bnN0IFNlbGVjdG9yRGF0YSYpIGNvbnN0OwogI2VuZGlmIC8vIEVOQUJMRShDU1NfU0VMRUNUT1Jf SklUKQogCiAgICAgVmVjdG9yPFNlbGVjdG9yRGF0YT4gbV9zZWxlY3RvcnM7Cg== 234519 2014-07-07 15:25:45 -0700 2014-07-09 10:45:27 -0700 Patch bug-134695-20140707152527.patch text/plain 9679 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDg1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE0LTA3LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkZWQgY3Nz IGppdCBwcm9maWxlciwgZGlzYWJsZWQgYnkgZGVmYXVsdC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDY5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjpydWxlTWF0Y2hlcyk6 CisgICAgICAgIFRlbGwgdGhlIFJ1bGVEYXRhIHdoZW4gaXRzIGNvbXBpbGVkIHNlbGVjdG9yIGlz IHVzZWQuCisgICAgICAgICogY3NzL1J1bGVTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UnVs ZURhdGE6OlJ1bGVEYXRhKToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgY29tcGlsZWQgc2VsZWN0 b3IgdXNlIGNvdW50IHRvIDAuCisgICAgICAgICogY3NzL1J1bGVTZXQuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJ1bGVEYXRhOjp+UnVsZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UnVsZURhdGE6 OmNvbXBpbGVkU2VsZWN0b3JVc2VkKToKKyAgICAgICAgQ291bnQgYW5kIGxvZyB0aGUgbnVtYmVy IG9mIHRpbWVzIGEgY29tcGlsZWQgc2VsZWN0b3IgaXMgdXNlZC4KKyAgICAgICAgKiBjc3NqaXQv U2VsZWN0b3JDb21waWxlci5oOgorICAgICAgICBBZGRlZCBvcHRpb24gZm9yIENTU19TRUxFQ1RP Ul9KSVRfUFJPRklMSU5HIHNldCB0byAwIGJ5IGRlZmF1bHQuCisgICAgICAgICogZG9tL1NlbGVj dG9yUXVlcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0 ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVj dG9yRGF0YUxpc3Q6OmV4ZWN1dGUpOgorICAgICAgICBUZWxsIHRoZSBTZWxlY3RvckRhdGEgd2hl biBpdHMgY29tcGlsZWQgc2VsZWN0b3IgaXMgdXNlZC4KKyAgICAgICAgKiBkb20vU2VsZWN0b3JR dWVyeS5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6U2VsZWN0b3JEYXRh OjpTZWxlY3RvckRhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6U2Vs ZWN0b3JEYXRhOjp+U2VsZWN0b3JEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0 YUxpc3Q6OlNlbGVjdG9yRGF0YTo6Y29tcGlsZWRTZWxlY3RvclVzZWQpOgorICAgICAgICBDb3Vu dCBhbmQgbG9nIHRoZSBudW1iZXIgb2YgdGltZXMgYSBjb21waWxlZCBzZWxlY3RvciBpcyB1c2Vk LgorCiAyMDE0LTA3LTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW2lPUyBXZWJHTF0gRml4IGNyYXNoIHdpdGggdG9vIG1hbnkgbmVzdGVk IGdsc2wgZnVuY3Rpb25zLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29s bGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVD b2xsZWN0b3IuY3BwCShyZXZpc2lvbiAxNzA4NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvRWxl bWVudFJ1bGVDb2xsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsNiArMzAzLDkgQEAg aW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYQogCiAgICAgICAgIGlmIChy dWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6 OlNpbXBsZVNlbGVjdG9yQ2hlY2tlcikgewogICAgICAgICAgICAgU2VsZWN0b3JDb21waWxlcjo6 U2ltcGxlU2VsZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlciA9IFNlbGVjdG9yQ29tcGlsZXI6 OnNpbXBsZVNlbGVjdG9yQ2hlY2tlckZ1bmN0aW9uKGNvbXBpbGVkU2VsZWN0b3JDaGVja2VyLCBy dWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpKTsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJ TElORworICAgICAgICAgICAgcnVsZURhdGEuY29tcGlsZWRTZWxlY3RvclVzZWQoKTsKKyNlbmRp ZgogICAgICAgICAgICAgcmV0dXJuIHNlbGVjdG9yQ2hlY2tlcigmbV9lbGVtZW50KTsKICAgICAg ICAgfQogICAgICAgICBBU1NFUlQocnVsZURhdGEuY29tcGlsYXRpb25TdGF0dXMoKSA9PSBTZWxl Y3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0 KTsKQEAgLTMxMSw2ICszMTQsOSBAQCBpbmxpbmUgYm9vbCBFbGVtZW50UnVsZUNvbGxlY3Rvcjo6 cnVsZU1hCiAgICAgICAgIFNlbGVjdG9yQ29tcGlsZXI6OkNoZWNraW5nQ29udGV4dCBjb250ZXh0 OwogICAgICAgICBjb250ZXh0LmVsZW1lbnRTdHlsZSA9IG1fc3R5bGU7CiAgICAgICAgIGNvbnRl eHQucmVzb2x2aW5nTW9kZSA9IG1fbW9kZTsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElO RworICAgICAgICBydWxlRGF0YS5jb21waWxlZFNlbGVjdG9yVXNlZCgpOworI2VuZGlmCiAgICAg ICAgIHJldHVybiBzZWxlY3RvckNoZWNrZXIoJm1fZWxlbWVudCwgJmNvbnRleHQpOwogICAgIH0K ICNlbmRpZiAvLyBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9SdWxlU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNl dC5jcHAJKHJldmlzaW9uIDE3MDg0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTQwLDYgKzE0MCw5IEBAIFJ1bGVEYXRhOjpSdWxlRGF0YShT dHlsZVJ1bGUqIHJ1bGUsIHVuc2kKICAgICAsIG1fbGlua01hdGNoVHlwZShTZWxlY3RvckNoZWNr ZXI6OmRldGVybWluZUxpbmtNYXRjaFR5cGUoc2VsZWN0b3IoKSkpCiAgICAgLCBtX2hhc0RvY3Vt ZW50U2VjdXJpdHlPcmlnaW4oYWRkUnVsZUZsYWdzICYgUnVsZUhhc0RvY3VtZW50U2VjdXJpdHlP cmlnaW4pCiAgICAgLCBtX3Byb3BlcnR5V2hpdGVsaXN0VHlwZShkZXRlcm1pbmVQcm9wZXJ0eVdo aXRlbGlzdFR5cGUoYWRkUnVsZUZsYWdzLCBzZWxlY3RvcigpKSkKKyNpZiBDU1NfU0VMRUNUT1Jf SklUX1BST0ZJTElORworICAgICwgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291bnQoMCkKKyNlbmRp ZgogewogICAgIEFTU0VSVChtX3Bvc2l0aW9uID09IHBvc2l0aW9uKTsKICAgICBBU1NFUlQobV9z ZWxlY3RvckluZGV4ID09IHNlbGVjdG9ySW5kZXgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L1J1bGVTZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCShy ZXZpc2lvbiAxNzA4NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNs dWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5oPgor I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC04NSw2ICs4NiwxNCBAQCBwdWJsaWM6CiAgICAgICAgIG1fY29tcGlsYXRpb25TdGF0dXMgPSBz dGF0dXM7CiAgICAgICAgIG1fY29tcGlsZWRTZWxlY3RvckNvZGVSZWYgPSBjb2RlUmVmOwogICAg IH0KKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgIH5SdWxlRGF0YSgpCisgICAg eworICAgICAgICBpZiAobV9jb21waWxlZFNlbGVjdG9yQ29kZVJlZi5jb2RlKCkuZXhlY3V0YWJs ZUFkZHJlc3MoKSkKKyAgICAgICAgICAgIGRhdGFMb2dGKCJSdWxlRGF0YSBjb21waWxlZCBzZWxl Y3RvciAlZCBcIiVzXCJcbiIsIG1fY29tcGlsZWRTZWxlY3RvclVzZUNvdW50LCBzZWxlY3Rvcigp LT5zZWxlY3RvclRleHQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICB9CisgICAgdm9pZCBjb21waWxl ZFNlbGVjdG9yVXNlZCgpIGNvbnN0IHsgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291bnQrKzsgfQor I2VuZGlmCiAjZW5kaWYgLy8gRU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiAKIHByaXZhdGU6CkBA IC0xMDYsNiArMTE1LDkgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkK ICAgICBtdXRhYmxlIFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXMgbV9jb21waWxhdGlvblN0YXR1 czsKICAgICBtdXRhYmxlIEpTQzo6TWFjcm9Bc3NlbWJsZXJDb2RlUmVmIG1fY29tcGlsZWRTZWxl Y3RvckNvZGVSZWY7CisjaWYgQ1NTX1NFTEVDVE9SX0pJVF9QUk9GSUxJTkcKKyAgICBtdXRhYmxl IHVuc2lnbmVkIG1fY29tcGlsZWRTZWxlY3RvclVzZUNvdW50OworI2VuZGlmCiAjZW5kaWYgLy8g RU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiB9OwogICAgIApAQCAtMTE0LDYgKzEyNiw5IEBAIHN0 cnVjdCBTYW1lU2l6ZUFzUnVsZURhdGEgewogICAgIHVuc2lnbmVkIGNvbXBpbGF0aW9uU3RhdHVz OwogICAgIHZvaWQqIGNvbXBpbGVkU2VsZWN0b3JQb2ludGVyOwogICAgIHZvaWQqIGNvZGVSZWZQ dHI7CisjaWYgQ1NTX1NFTEVDVE9SX0pJVF9QUk9GSUxJTkcKKyAgICB1bnNpZ25lZCBjb21waWxl ZFNlbGVjdG9yVXNlQ291bnQ7CisjZW5kaWYKICNlbmRpZiAvLyBFTkFCTEUoQ1NTX1NFTEVDVE9S X0pJVCkKIAogICAgIHZvaWQqIGE7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0 b3JDb21waWxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3Rv ckNvbXBpbGVyLmgJKHJldmlzaW9uIDE3MDg0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzc2ppdC9T ZWxlY3RvckNvbXBpbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDggQEAKICNpbmNs dWRlICJTZWxlY3RvckNoZWNrZXIuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9NYWNyb0Fz c2VtYmxlckNvZGVSZWYuaD4KIAorI2RlZmluZSBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORyAx CisKIG5hbWVzcGFjZSBKU0MgewogY2xhc3MgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmOwogY2xhc3Mg Vk07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCShyZXZpc2lvbiAxNzA4 NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM2MSw5ICszNjEsMTQgQEAgQUxXQVlTX0lOTElORSB2b2lkIFNlbGVjdG9yRGF0YUxp c3Q6OmV4ZQogCiAjaWYgRU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiB0ZW1wbGF0ZSA8dHlwZW5h bWUgU2VsZWN0b3JRdWVyeVRyYWl0PgotQUxXQVlTX0lOTElORSB2b2lkIFNlbGVjdG9yRGF0YUxp c3Q6OmV4ZWN1dGVDb21waWxlZFNpbXBsZVNlbGVjdG9yQ2hlY2tlcihjb25zdCBDb250YWluZXJO b2RlJiByb290Tm9kZSwgU2VsZWN0b3JDb21waWxlcjo6U2ltcGxlU2VsZWN0b3JDaGVja2VyIHNl bGVjdG9yQ2hlY2tlciwgdHlwZW5hbWUgU2VsZWN0b3JRdWVyeVRyYWl0OjpPdXRwdXRUeXBlJiBv dXRwdXQpIGNvbnN0CitBTFdBWVNfSU5MSU5FIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0 ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKGNvbnN0IENvbnRhaW5lck5vZGUmIHJvb3RO b2RlLCBTZWxlY3RvckNvbXBpbGVyOjpTaW1wbGVTZWxlY3RvckNoZWNrZXIgc2VsZWN0b3JDaGVj a2VyLCB0eXBlbmFtZSBTZWxlY3RvclF1ZXJ5VHJhaXQ6Ok91dHB1dFR5cGUmIG91dHB1dCwgY29u c3QgU2VsZWN0b3JEYXRhJiBzZWxlY3RvckRhdGEpIGNvbnN0CiB7CiAgICAgZm9yIChhdXRvJiBl bGVtZW50IDogZWxlbWVudERlc2NlbmRhbnRzKGNvbnN0X2Nhc3Q8Q29udGFpbmVyTm9kZSY+KHJv b3ROb2RlKSkpIHsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgICAgICBzZWxl Y3RvckRhdGEuY29tcGlsZWRTZWxlY3RvclVzZWQoKTsKKyNlbHNlCisgICAgICAgIFVOVVNFRF9Q QVJBTShzZWxlY3RvckRhdGEpOworI2VuZGlmCiAgICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIo JmVsZW1lbnQpKSB7CiAgICAgICAgICAgICBTZWxlY3RvclF1ZXJ5VHJhaXQ6OmFwcGVuZE91dHB1 dEZvckVsZW1lbnQob3V0cHV0LCAmZWxlbWVudCk7CiAgICAgICAgICAgICBpZiAoU2VsZWN0b3JR dWVyeVRyYWl0OjpzaG91bGRPbmx5TWF0Y2hGaXJzdEVsZW1lbnQpCkBAIC00MzUsNyArNDQwLDcg QEAgQUxXQVlTX0lOTElORSB2b2lkIFNlbGVjdG9yRGF0YUxpc3Q6OmV4ZQogICAgICAgICBjb25z dCBTZWxlY3RvckRhdGEmIHNlbGVjdG9yRGF0YSA9IG1fc2VsZWN0b3JzLmZpcnN0KCk7CiAgICAg ICAgIHZvaWQqIGNvbXBpbGVkU2VsZWN0b3JDaGVja2VyID0gc2VsZWN0b3JEYXRhLmNvbXBpbGVk U2VsZWN0b3JDb2RlUmVmLmNvZGUoKS5leGVjdXRhYmxlQWRkcmVzcygpOwogICAgICAgICBTZWxl Y3RvckNvbXBpbGVyOjpTaW1wbGVTZWxlY3RvckNoZWNrZXIgc2VsZWN0b3JDaGVja2VyID0gU2Vs ZWN0b3JDb21waWxlcjo6c2ltcGxlU2VsZWN0b3JDaGVja2VyRnVuY3Rpb24oY29tcGlsZWRTZWxl Y3RvckNoZWNrZXIsIHNlbGVjdG9yRGF0YS5jb21waWxhdGlvblN0YXR1cyk7Ci0gICAgICAgIGV4 ZWN1dGVDb21waWxlZFNpbXBsZVNlbGVjdG9yQ2hlY2tlcjxTZWxlY3RvclF1ZXJ5VHJhaXQ+KCpz ZWFyY2hSb290Tm9kZSwgc2VsZWN0b3JDaGVja2VyLCBvdXRwdXQpOworICAgICAgICBleGVjdXRl Q29tcGlsZWRTaW1wbGVTZWxlY3RvckNoZWNrZXI8U2VsZWN0b3JRdWVyeVRyYWl0Pigqc2VhcmNo Um9vdE5vZGUsIHNlbGVjdG9yQ2hlY2tlciwgb3V0cHV0LCBzZWxlY3RvckRhdGEpOwogICAgICAg ICBicmVhazsKICAgICAgICAgfQogI2Vsc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9TZWxl Y3RvclF1ZXJ5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVl cnkuaAkocmV2aXNpb24gMTcwODQ5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVl cnkuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9IYXNo TWFwLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21p Y1N0cmluZ0hhc2guaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNTUsNiArNTYsOSBAQCBwcml2YXRlOgogICAgIHN0cnVjdCBTZWxl Y3RvckRhdGEgewogICAgICAgICBTZWxlY3RvckRhdGEoY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVj dG9yLCBib29sIGlzRmFzdENoZWNrYWJsZSkKICAgICAgICAgICAgIDogc2VsZWN0b3Ioc2VsZWN0 b3IpCisjaWYgQ1NTX1NFTEVDVE9SX0pJVF9QUk9GSUxJTkcKKyAgICAgICAgICAgICwgbV9jb21w aWxlZFNlbGVjdG9yVXNlQ291bnQoMCkKKyNlbmRpZgogICAgICAgICAgICAgLCBpc0Zhc3RDaGVj a2FibGUoaXNGYXN0Q2hlY2thYmxlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTYzLDYgKzY3 LDE1IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiAgICAgICAgIG11 dGFibGUgSlNDOjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYgY29tcGlsZWRTZWxlY3RvckNvZGVSZWY7 CiAgICAgICAgIG11dGFibGUgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21waWxhdGlvblN0 YXR1czsKKyNpZiBDU1NfU0VMRUNUT1JfSklUX1BST0ZJTElORworICAgICAgICB+U2VsZWN0b3JE YXRhKCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVm LmNvZGUoKS5leGVjdXRhYmxlQWRkcmVzcygpKQorICAgICAgICAgICAgICAgIGRhdGFMb2dGKCJT ZWxlY3RvckRhdGEgY29tcGlsZWQgc2VsZWN0b3IgJWQgXCIlc1wiXG4iLCBtX2NvbXBpbGVkU2Vs ZWN0b3JVc2VDb3VudCwgc2VsZWN0b3ItPnNlbGVjdG9yVGV4dCgpLnV0ZjgoKS5kYXRhKCkpOwor ICAgICAgICB9CisgICAgICAgIG11dGFibGUgdW5zaWduZWQgbV9jb21waWxlZFNlbGVjdG9yVXNl Q291bnQ7CisgICAgICAgIHZvaWQgY29tcGlsZWRTZWxlY3RvclVzZWQoKSBjb25zdCB7IG1fY29t cGlsZWRTZWxlY3RvclVzZUNvdW50Kys7IH0KKyNlbmRpZgogI2VuZGlmIC8vIEVOQUJMRShDU1Nf U0VMRUNUT1JfSklUKQogICAgICAgICBib29sIGlzRmFzdENoZWNrYWJsZTsKICAgICB9OwpAQCAt NzYsNyArODksNyBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBTZWxlY3RvclF1 ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZVNpbmdsZVNlbGVjdG9yRGF0YShjb25zdCBDb250YWluZXJO b2RlJiByb290Tm9kZSwgY29uc3QgU2VsZWN0b3JEYXRhJiwgdHlwZW5hbWUgU2VsZWN0b3JRdWVy eVRyYWl0OjpPdXRwdXRUeXBlJikgY29uc3Q7CiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFNlbGVj dG9yUXVlcnlUcmFpdD4gdm9pZCBleGVjdXRlU2luZ2xlTXVsdGlTZWxlY3RvckRhdGEoY29uc3Qg Q29udGFpbmVyTm9kZSYgcm9vdE5vZGUsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlUcmFpdDo6T3V0 cHV0VHlwZSYpIGNvbnN0OwogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JfSklUKQotICAgIHRlbXBs YXRlIDx0eXBlbmFtZSBTZWxlY3RvclF1ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZUNvbXBpbGVkU2lt cGxlU2VsZWN0b3JDaGVja2VyKGNvbnN0IENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBTZWxlY3Rv ckNvbXBpbGVyOjpTaW1wbGVTZWxlY3RvckNoZWNrZXIsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlU cmFpdDo6T3V0cHV0VHlwZSYpIGNvbnN0OworICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBTZWxlY3Rv clF1ZXJ5VHJhaXQ+IHZvaWQgZXhlY3V0ZUNvbXBpbGVkU2ltcGxlU2VsZWN0b3JDaGVja2VyKGNv bnN0IENvbnRhaW5lck5vZGUmIHJvb3ROb2RlLCBTZWxlY3RvckNvbXBpbGVyOjpTaW1wbGVTZWxl Y3RvckNoZWNrZXIsIHR5cGVuYW1lIFNlbGVjdG9yUXVlcnlUcmFpdDo6T3V0cHV0VHlwZSYsIGNv bnN0IFNlbGVjdG9yRGF0YSYpIGNvbnN0OwogI2VuZGlmIC8vIEVOQUJMRShDU1NfU0VMRUNUT1Jf SklUKQogCiAgICAgVmVjdG9yPFNlbGVjdG9yRGF0YT4gbV9zZWxlY3RvcnM7Cg==