151624 2015-11-26 06:15:03 -0800 Fix the B3 build with GCC 4.9.3 2016-01-29 01:47:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 153422 152248 1 ossy ysuzuki benjamin commit-queue fpizlo ggaren keith_miller mark.lam mcatanzaro msaboff ossy saam ysuzuki zan oldest_to_newest 1144503 0 ossy 2015-11-26 06:15:03 -0800 ../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp: In lambda function: ../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:154:13: internal compiler error: in gimplify_var_or_parm_decl, at gimplify.c:1741 inst.forEachTmp([&] (Tmp& otherArg, Arg::Role role, Arg::Type otherArgType) { ^ Please submit a full bug report, with preprocessed source if appropriate. See <file:///usr/share/doc/gcc-4.9/README.Bugs> for instructions. Preprocessed source stored into /tmp/ccVqyjJp.out file, please attach this to your bugreport. It is a reported and fixed GCC bug - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62272 But unfortunately it is fixed only in GCC 5.2 and the bug is still valid in GCC 4.9.3. Can we workaround this util we require at least GCC 5.2 version ? 1144527 1 266188 ossy 2015-11-26 09:10:12 -0800 Created attachment 266188 Patch WIP workaround, don't use nested lambdas. Have you got a better idea or can we add a similar workaround? 1144528 2 commit-queue 2015-11-26 09:11:21 -0800 Attachment 266188 did not pass style-queue: ERROR: Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:153: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1144530 3 266188 fpizlo 2015-11-26 09:34:07 -0800 Comment on attachment 266188 Patch I'm strongly opposed to this fix. std::function requires extra heap allocation in many cases. 1144541 4 ossy 2015-11-26 13:14:01 -0800 (In reply to comment #3) > Comment on attachment 266188 [details] > Patch > > I'm strongly opposed to this fix. std::function requires extra heap > allocation in many cases. Could you suggest a better workaround? If no, can we add workaround for only GCC older than 5.2.1? Or should we wait some months, maybe a year to be able to enable B3 on Linux when we can drop supporting older compilers. Are you planning to maintain the llvm backend for a while or will you remove it immediately once B3 is stable enough? 1144543 5 fpizlo 2015-11-26 16:30:46 -0800 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 266188 [details] > > Patch > > > > I'm strongly opposed to this fix. std::function requires extra heap > > allocation in many cases. > > Could you suggest a better workaround? You could use wtf/ScopedLambda instead of std::function, but I'm not sure how that interacts with bind and so forth. > > If no, can we add workaround for only GCC older than 5.2.1? That makes sense, though have you tried some finer grained work arounds? Is it really the case that you can only work around the bug by using a function rather than just trying to use lambdas in a slightly different way? > Or should we wait some months, maybe a year to be able to > enable B3 on Linux when we can drop supporting older compilers. We could do that, but... > > Are you planning to maintain the llvm backend for a while > or will you remove it immediately once B3 is stable enough? We will probably get rid of llvm soon. 1148167 6 267107 ossy 2015-12-10 07:20:06 -0800 Created attachment 267107 Patch updated the same workaround to ToT 1148169 7 commit-queue 2015-12-10 07:22:31 -0800 Attachment 267107 did not pass style-queue: ERROR: Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:185: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1148170 8 ossy 2015-12-10 07:23:24 -0800 (In reply to comment #5) > You could use wtf/ScopedLambda instead of std::function, but I'm not sure > how that interacts with bind and so forth. Thanks, I'll check if we can use it. Or we might not enable B3 until we require the compiler which can complile it properly. 1148218 9 fpizlo 2015-12-10 09:20:13 -0800 (In reply to comment #8) > (In reply to comment #5) > > You could use wtf/ScopedLambda instead of std::function, but I'm not sure > > how that interacts with bind and so forth. > > Thanks, I'll check if we can use it. Or we might not enable B3 > until we require the compiler which can complile it properly. Note that when we enable B3, we will rip out LLVM and start deleting any code guarded by !FTL_USES_B3 until we no longer have the FTL_USES_B3 variable. It might be worth figuring out what a good workaround would look like. We use many lambdas in WebKit and none of them hit this bug. Do you know what, specifically, the bug is? I'd be happy with playing with performance-neutral restructurings of this code and I only oppose the use of std::function because I fear that it will really hurt performance. 1153795 10 268537 ossy 2016-01-08 03:56:32 -0800 Created attachment 268537 Patch updated the same workaround to ToT 1153796 11 ossy 2016-01-08 04:18:59 -0800 (In reply to comment #9) > Note that when we enable B3, we will rip out LLVM and start deleting any > code guarded by !FTL_USES_B3 until we no longer have the FTL_USES_B3 > variable. It isn't a blocker issue. If we won't be able to make B3-FTL build and as stable as LLVM-FTL is now on Linux, we can simply disable building FTL JIT until proper fix. > It might be worth figuring out what a good workaround would look like. We > use many lambdas in WebKit and none of them hit this bug. Do you know what, > specifically, the bug is? I'd be happy with playing with > performance-neutral restructurings of this code and I only oppose the use of > std::function because I fear that it will really hurt performance. I don't know the logic of this code at all and I'm not interested to try to find a workaround any more, because Ubuntu 15.04 will reach its end of life at the end of January, so we have to migrate to 15.10 soon which has newer GCC which doesn't have this issue. (Otherwise the issue can be found in the description of this bug report if somebody is still interested in workarounding it for older GCC.) 1154365 12 mcatanzaro 2016-01-11 07:23:13 -0800 A GCC dependency bump would jeopardize our ability to get distributors to release our updates and consequentially the security of our users. But we can conditionally enable FTL depending on the version of GCC is use. Distros with the latest GCC will get the latest and greatest, but it will cause no real problems for distros that don't have it. This can be addressed easily when B3 is exposed to CMake. 1159864 13 ysuzuki 2016-01-28 13:48:38 -0800 Seeing https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62272, I noticed that we have very very easy (and no performance regression!!!) fix for this issue. Just replacing `addEdge` in the nested lambda to `this->addEdge`. Filip, how about this? 1159892 14 270149 ysuzuki 2016-01-28 14:50:49 -0800 Created attachment 270149 Patch 1159912 15 ysuzuki 2016-01-28 15:21:58 -0800 Committed r195788: <http://trac.webkit.org/changeset/195788> 1160064 16 ossy 2016-01-29 01:47:32 -0800 (In reply to comment #13) > Seeing https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62272, I noticed that we > have very very easy (and no performance regression!!!) fix for this issue. > Just replacing `addEdge` in the nested lambda to `this->addEdge`. Yay, we should have read this bug report in details. :) Thanks for the fix. 266188 2015-11-26 09:10:12 -0800 2015-12-10 07:20:00 -0800 Patch bug-151624-20151126180954.patch text/plain 2460 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 NDRkNzZiNzBkZjdhNGIyN2Q0YmI4OTVhYTg1ZTM5NWE5MWE3MDNlLi5lYTgzZWVmMThmYTliNzE2 Njg4YzVlN2YyZTUyOWU2ZTkxZTAzYjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0xMS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEZpeCB0aGUgQjMgYnVpbGQgd2l0aCBHQ0MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYyNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYjMvYWlyL0Fpckl0ZXJhdGVkUmVn aXN0ZXJDb2FsZXNjaW5nLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6SXRlcmF0ZWRSZWdp c3RlckNvYWxlc2NpbmdBbGxvY2F0b3I6OmJ1aWxkKToKKwogMjAxNS0xMS0yNCAgQ2FpdGxpbiBQ b3R0ZXIgIDxjYWl0cEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtKU0NdIHN1cHBvcnQgQ29tcHV0 ZWQgUHJvcGVydHkgTmFtZXMgaW4gZGVzdHJ1Y3R1cmluZyBQYXR0ZXJucwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2lu Zy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJD b2FsZXNjaW5nLmNwcAppbmRleCA4ZWY4ZDE3NWE5MGI4NjYyNWE1ZmY1OWRhMTRlN2MyZTFhNzI4 MWY2Li41YjNjYTY0Y2VkOTg2Y2FiNGZhOWU1ZGQxYjFlMjRmYjNkNGY4ZmE1IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJDb2FsZXNj aW5nLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVn aXN0ZXJDb2FsZXNjaW5nLmNwcApAQCAtMzcsNiArMzcsOCBAQAogI2luY2x1ZGUgPHd0Zi9MaXN0 RHVtcC5oPgogI2luY2x1ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgogCit1c2luZyBuYW1lc3BhY2Ug c3RkOjpwbGFjZWhvbGRlcnM7CisKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgQjMgeyBuYW1l c3BhY2UgQWlyIHsKIAogc3RhdGljIGJvb2wgZGVidWcgPSBmYWxzZTsKQEAgLTE0NywxNyArMTQ5 LDIxIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYnVpbGQoSW5zdCYgaW5zdCwgY29uc3QgTGl2ZW5l c3M8VG1wPjo6TG9jYWxDYWxjJiBsb2NhbENhbGMpCiAgICAgeworCisgICAgICAgIGF1dG8gZm9v ID0gWyZdIChUbXAmIGFyZywgVG1wJiBvdGhlckFyZywgQXJnOjpSb2xlIHJvbGUsIEFyZzo6VHlw ZSBvdGhlckFyZ1R5cGUpIHsKKyAgICAgICAgICAgIGlmIChvdGhlckFyZ1R5cGUgIT0gdHlwZSkK KyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmIChBcmc6OmlzRGVmKHJv bGUpKQorICAgICAgICAgICAgICAgIGFkZEVkZ2UoYXJnLCBvdGhlckFyZyk7CisgICAgICAgIH07 CisKICAgICAgICAgaW5zdC5mb3JFYWNoRGVmQW5kRXh0cmFDbG9iYmVyZWRUbXAodHlwZSwgWyZd IChUbXAmIGFyZykgewogICAgICAgICAgICAgLy8gQWxsIHRoZSBEZWYoKXMgaW50ZXJmZXJlIHdp dGggZWFjaCBvdGhlciBhbmQgd2l0aCBhbGwgdGhlIGV4dHJhIGNsb2JiZXJlZCBUbXBzLgogICAg ICAgICAgICAgLy8gV2Ugc2hvdWxkIG5vdCB1c2UgZm9yRWFjaERlZkFuZEV4dHJhQ2xvYmJlcmVk VG1wKCkgaGVyZSBzaW5jZSBjb2xvcmVkIFRtcHMKICAgICAgICAgICAgIC8vIGRvIG5vdCBuZWVk IGludGVyZmVyZW5jZSBlZGdlcyBpbiBvdXIgaW1wbGVtZW50YXRpb24uCi0gICAgICAgICAgICBp bnN0LmZvckVhY2hUbXAoWyZdIChUbXAmIG90aGVyQXJnLCBBcmc6OlJvbGUgcm9sZSwgQXJnOjpU eXBlIG90aGVyQXJnVHlwZSkgewotICAgICAgICAgICAgICAgIGlmIChvdGhlckFyZ1R5cGUgIT0g dHlwZSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICAgICAgaWYg KEFyZzo6aXNEZWYocm9sZSkpCi0gICAgICAgICAgICAgICAgICAgIGFkZEVkZ2UoYXJnLCBvdGhl ckFyZyk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9pZChU bXAmLCBBcmc6OlJvbGUsIEFyZzo6VHlwZSk+IGZvbzIgPSBzdGQ6OmJpbmQoZm9vLCBhcmcsIF8x LCBfMiwgXzMpOworICAgICAgICAgICAgaW5zdC5mb3JFYWNoVG1wKGZvbzIpOwogICAgICAgICB9 KTsKIAogICAgICAgICBpZiAoTW92ZUluc3RIZWxwZXI8dHlwZT46Om1heUJlQ29hbGVzY2FibGUo aW5zdCkpIHsK 267107 2015-12-10 07:20:06 -0800 2016-01-08 03:56:27 -0800 Patch bug-151624-20151210161934.patch text/plain 2665 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzOTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OTc1NGFlMmYzM2I4OTQ4ODE0ZTZiNDk0MjZiM2JiYzZlYzI5MTYxLi5hMTY5YjQ1NWM4YTk2NmUw NjgwNzBiNjEwNzg2ZjE1ZDg1NzQ0MTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxNS0xMi0xMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgogCisgICAgICAgIEZpeCB0aGUgQjMgYnVpbGQgd2l0aCBHQ0MgNC45LjMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYyNAorCisgICAgICAg IE9PUFMhIC0gd29ya2Fyb3VuZCwgbm90IGZvciByZXZpZXcgYW5kIGxhbmRpbmcgLSBPT1BTIQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYjMvYWly L0Fpckl0ZXJhdGVkUmVnaXN0ZXJDb2FsZXNjaW5nLmNwcDoKKworMjAxNS0xMi0xMCAgQ3NhYmEg T3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCiAgICAgICAgIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9jcmVhdGVfaGFzaF90YWJsZSBzaG91bGRuJ3QgYmUgdG9vIHZlcmJvc2UKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTg2MQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJD b2FsZXNjaW5nLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlySXRlcmF0ZWRS ZWdpc3RlckNvYWxlc2NpbmcuY3BwCmluZGV4IDUwMmM4OWRmNmQwN2Y5NzFkZjdjZmJhYWRmZWQ3 MDI1ZjdhOTZkOWYuLjNkZTJjYmFjMGU2Yzc3M2MzNTlmYzM4ZWQxMTRlZDg2YzhiMDkzZWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlySXRlcmF0ZWRSZWdpc3Rl ckNvYWxlc2NpbmcuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlySXRl cmF0ZWRSZWdpc3RlckNvYWxlc2NpbmcuY3BwCkBAIC0zOSw2ICszOSw4IEBACiAjaW5jbHVkZSA8 d3RmL0xpc3REdW1wLmg+CiAjaW5jbHVkZSA8d3RmL0xpc3RIYXNoU2V0Lmg+CiAKK3VzaW5nIG5h bWVzcGFjZSBzdGQ6OnBsYWNlaG9sZGVyczsKKwogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBC MyB7IG5hbWVzcGFjZSBBaXIgewogCiBuYW1lc3BhY2UgewpAQCAtMTc5LDYgKzE4MSwxMyBAQCBw cml2YXRlOgogCiAgICAgdm9pZCBidWlsZChJbnN0JiBpbnN0LCBJbnN0KiBuZXh0SW5zdCwgY29u c3QgdHlwZW5hbWUgVG1wTGl2ZW5lc3M8dHlwZT46OkxvY2FsQ2FsYyYgbG9jYWxDYWxjKQogICAg IHsKKworICAgICAgICBhdXRvIGZvbyA9IFsmXSAoVG1wJiBhcmcsIFRtcCYgb3RoZXJBcmcsIEFy Zzo6Um9sZSByb2xlLCBBcmc6OlR5cGUgYXJnVHlwZSkgeworICAgICAgICAgICAgaWYgKCFBcmc6 OmlzRGVmKHJvbGUpIHx8IGFyZ1R5cGUgIT0gdHlwZSkKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICBhZGRFZGdlKGFyZywgb3RoZXJBcmcpOworICAgICAgICB9OworCiAgICAg ICAgIGluc3QuZm9yRWFjaFRtcFdpdGhFeHRyYUNsb2JiZXJlZFJlZ3MoCiAgICAgICAgICAgICBu ZXh0SW5zdCwKICAgICAgICAgICAgIFsmXSAoY29uc3QgVG1wJiBhcmcsIEFyZzo6Um9sZSByb2xl LCBBcmc6OlR5cGUgYXJnVHlwZSkgewpAQCAtMTg4LDEyICsxOTcsOCBAQCBwcml2YXRlOgogICAg ICAgICAgICAgICAgIC8vIEFsbCB0aGUgRGVmKClzIGludGVyZmVyZSB3aXRoIGVhY2ggb3RoZXIg YW5kIHdpdGggYWxsIHRoZSBleHRyYSBjbG9iYmVyZWQgVG1wcy4KICAgICAgICAgICAgICAgICAv LyBXZSBzaG91bGQgbm90IHVzZSBmb3JFYWNoRGVmQW5kRXh0cmFDbG9iYmVyZWRUbXAoKSBoZXJl IHNpbmNlIGNvbG9yZWQgVG1wcwogICAgICAgICAgICAgICAgIC8vIGRvIG5vdCBuZWVkIGludGVy ZmVyZW5jZSBlZGdlcyBpbiBvdXIgaW1wbGVtZW50YXRpb24uCi0gICAgICAgICAgICAgICAgaW5z dC5mb3JFYWNoVG1wKFsmXSAoVG1wJiBvdGhlckFyZywgQXJnOjpSb2xlIHJvbGUsIEFyZzo6VHlw ZSBhcmdUeXBlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIUFyZzo6aXNEZWYocm9s ZSkgfHwgYXJnVHlwZSAhPSB0eXBlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgYWRk RWRnZShhcmcsIG90aGVyQXJnKTsKLSAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAg ICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKFRtcCYsIEFyZzo6Um9sZSwgQXJnOjpUeXBlKT4gZm9v MiA9IHN0ZDo6YmluZChmb28sIGFyZywgXzEsIF8yLCBfMyk7CisgICAgICAgICAgICAgICAgaW5z dC5mb3JFYWNoVG1wKGZvbzIpOwogICAgICAgICAgICAgfSk7CiAKICAgICAgICAgaWYgKE1vdmVJ bnN0SGVscGVyPHR5cGU+OjptYXlCZUNvYWxlc2NhYmxlKGluc3QpKSB7Cg== 268537 2016-01-08 03:56:32 -0800 2016-01-28 14:50:44 -0800 Patch bug-151624-20160108125600.patch text/plain 2679 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 MzgxZGI4MzRjNDE5MjJjMzY2MjU3OTgwNGZhNzJlNTgwMmVmYzg3Li5hNWM0NDQwMjQ5MTZhNTNl MTBmMWRhNDJmZTNiMjI5ZjcwYzI0OWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxNi0wMS0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEZpeCB0aGUgQjMgYnVpbGQgd2l0aCBHQ0MgNC45LjMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYyNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYjMvYWlyL0Fpckl0ZXJh dGVkUmVnaXN0ZXJDb2FsZXNjaW5nLmNwcDoKKwogMjAxNi0wMS0wNyAgRmlsaXAgUGl6bG8gIDxm cGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEZUTCBCMyBsYXp5IHNsb3cgcGF0aHMgc2hvdWxk IGRvIGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIv QWlySXRlcmF0ZWRSZWdpc3RlckNvYWxlc2NpbmcuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKaW5kZXggNmEwZjA5ZTVj NmNhMWEzNTAwMDFkZGU4OWI2MjkzYzM5ZjlmMzVmZi4uOTM1NjNjNjU3ZjdhNmVhNTVhZTIyYTdm NTI2YjQzZjhhYzFiODEwYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fp ci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKQEAgLTQxLDYg KzQxLDggQEAKICNpbmNsdWRlIDx3dGYvTGlzdER1bXAuaD4KICNpbmNsdWRlIDx3dGYvTGlzdEhh c2hTZXQuaD4KIAordXNpbmcgbmFtZXNwYWNlIHN0ZDo6cGxhY2Vob2xkZXJzOworCiBuYW1lc3Bh Y2UgSlNDIHsgbmFtZXNwYWNlIEIzIHsgbmFtZXNwYWNlIEFpciB7CiAKIG5hbWVzcGFjZSB7CkBA IC03ODAsMjMgKzc4MiwyNCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBidWlsZChJbnN0KiBwcmV2 SW5zdCwgSW5zdCogbmV4dEluc3QsIGNvbnN0IHR5cGVuYW1lIFRtcExpdmVuZXNzPHR5cGU+OjpM b2NhbENhbGMmIGxvY2FsQ2FsYykKICAgICB7CisKKyAgICAgICAgYXV0byBmb28gPSBbJl0gKFRt cCYgYXJnLCBUbXAmIG90aGVyQXJnLCBBcmc6OlJvbGUsIEFyZzo6VHlwZSBhcmdUeXBlLCBBcmc6 OldpZHRoKSB7CisgICAgICAgICAgICBpZiAoYXJnVHlwZSAhPSB0eXBlKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIGFkZEVkZ2UoYXJnLCBvdGhlckFyZyk7CisgICAgICAg IH07CisKICAgICAgICAgSW5zdDo6Zm9yRWFjaERlZldpdGhFeHRyYUNsb2JiZXJlZFJlZ3M8VG1w PigKICAgICAgICAgICAgIHByZXZJbnN0LCBuZXh0SW5zdCwKICAgICAgICAgICAgIFsmXSAoY29u c3QgVG1wJiBhcmcsIEFyZzo6Um9sZSwgQXJnOjpUeXBlIGFyZ1R5cGUsIEFyZzo6V2lkdGgpIHsK ICAgICAgICAgICAgICAgICBpZiAoYXJnVHlwZSAhPSB0eXBlKQogICAgICAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICAgICAgCisKICAgICAgICAgICAgICAgICAvLyBBbGwgdGhl IERlZigpcyBpbnRlcmZlcmUgd2l0aCBlYWNoIG90aGVyIGFuZCB3aXRoIGFsbCB0aGUgZXh0cmEg Y2xvYmJlcmVkIFRtcHMuCiAgICAgICAgICAgICAgICAgLy8gV2Ugc2hvdWxkIG5vdCB1c2UgZm9y RWFjaERlZldpdGhFeHRyYUNsb2JiZXJlZFJlZ3MoKSBoZXJlIHNpbmNlIGNvbG9yZWQgVG1wcwog ICAgICAgICAgICAgICAgIC8vIGRvIG5vdCBuZWVkIGludGVyZmVyZW5jZSBlZGdlcyBpbiBvdXIg aW1wbGVtZW50YXRpb24uCi0gICAgICAgICAgICAgICAgSW5zdDo6Zm9yRWFjaERlZjxUbXA+KAot ICAgICAgICAgICAgICAgICAgICBwcmV2SW5zdCwgbmV4dEluc3QsCi0gICAgICAgICAgICAgICAg ICAgIFsmXSAoVG1wJiBvdGhlckFyZywgQXJnOjpSb2xlLCBBcmc6OlR5cGUgYXJnVHlwZSwgQXJn OjpXaWR0aCkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFyZ1R5cGUgIT0gdHlwZSkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICAgICAgICAgIGFkZEVkZ2UoYXJnLCBvdGhlckFyZyk7Ci0g ICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIHN0ZDo6ZnVuY3Rpb248dm9p ZChUbXAmLCBBcmc6OlJvbGUsIEFyZzo6VHlwZSwgQXJnOjpXaWR0aCk+IGZvbzIgPSBzdGQ6OmJp bmQoZm9vLCBhcmcsIF8xLCBfMiwgXzMsIF80KTsKKyAgICAgICAgICAgICAgICBJbnN0Ojpmb3JF YWNoRGVmPFRtcD4ocHJldkluc3QsIG5leHRJbnN0LCBmb28yKTsKICAgICAgICAgICAgIH0pOwog CiAgICAgICAgIGlmIChwcmV2SW5zdCAmJiBtYXlCZUNvYWxlc2NhYmxlKCpwcmV2SW5zdCkpIHsK 270149 2016-01-28 14:50:49 -0800 2016-01-28 15:15:35 -0800 Patch bug-151624-20160129075023.patch text/plain 1653 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MzRjNDJmZDk3NzFjNWE0YjM5NTg0MDNlYzMzY2Q5NWY5Nzc1NjIyLi44ZTIyMGFkM2VmNTc2ZWNm OTAxMTlkNzE4NDhkNjlkMDAwOTBmMmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wMS0yOCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBGaXggdGhlIEIzIGJ1aWxkIHdpdGggR0NDIDQuOS4zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE2MjQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEdWUgdG8gR0NDIDQuOSdz IGNvbXBpbGVyIGlzc3VlWzFdLCBtZXRob2QgY2FsbHMgaW5zaWRlICgyIG9yIHNvKSBuZXN0ZWQg bGFtYmRhcyBuZWVkIHRvIHVzZSBgdGhpc2AgdG8gYXZvaWQgaW50ZXJuYWwgY29tcGlsZXIgZXJy b3JzLgorICAgICAgICBbMV06IGh0dHBzOi8vZ2NjLmdudS5vcmcvYnVnemlsbGEvc2hvd19idWcu Y2dpP2lkPTYyMjcyCisKKyAgICAgICAgKiBiMy9haXIvQWlySXRlcmF0ZWRSZWdpc3RlckNvYWxl c2NpbmcuY3BwOgorCiAyMDE2LTAxLTI4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgTG93ZXJUb0Fpcjo6cHJlZmVyUmlnaHRGb3JSZXN1bHQoKSBzaG91bGQgcmVz b2x2ZSB1c2UgY291bnQgdGllcyBieSBzZWxlY3RpbmcgdGhlIGNoaWxkIHRoYXQgaXMgY2xvc2Vz dCBpbiBhbiBpZG9tIHdhbGsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9h aXIvQWlySXRlcmF0ZWRSZWdpc3RlckNvYWxlc2NpbmcuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKaW5kZXggMDJlZjc0 MTU1MjBlMGZjZmZhODQzOThkMjFmYzIzOGMwNzczNDQ1Yy4uOTk5NmI5OWU0YTcwZGVlNGIyNDUy M2VhMGMxNGRmY2E4NDgwMjRiYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Iz L2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKQEAgLTgz NCw3ICs4MzQsNyBAQCBjbGFzcyBDb2xvcmluZ0FsbG9jYXRvciA6IHB1YmxpYyBBYnN0cmFjdENv bG9yaW5nQWxsb2NhdG9yPHVuc2lnbmVkPiB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo YXJnVHlwZSAhPSB0eXBlKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgYWRkRWRnZShh cmcsIG90aGVyQXJnKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMtPmFkZEVkZ2UoYXJn LCBvdGhlckFyZyk7CiAgICAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfSk7CiAK