117146 2013-06-03 07:18:52 -0700 Use ASSERT_DISABLED option for assertion purpose code in InlineBox 2013-06-04 03:26:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kangil.han kangil.han ap commit-queue esprehn+autocc glenn thorton oldest_to_newest 896433 0 kangil.han 2013-06-03 07:18:52 -0700 NDEBUG option is needed for any inInlineBoxDetach usage. 896434 1 203586 kangil.han 2013-06-03 07:21:23 -0700 Created attachment 203586 Patch 896446 2 203586 thorton 2013-06-03 07:48:08 -0700 Comment on attachment 203586 Patch This is already building and has been a long time, and ASSERTs are compiled out in release builds, so why do we need this? 896450 3 kangil.han 2013-06-03 07:54:51 -0700 (In reply to comment #2) > (From update of attachment 203586 [details]) > This is already building and has been a long time, and ASSERTs are compiled out in release builds, so why do we need this? Yes, this patch doesn't change any behavior in release(even debug) build. But would bring us a code consistency(readability). :) 896548 4 203586 ap 2013-06-03 11:00:27 -0700 Comment on attachment 203586 Patch You are right that the code is not quite correct - NDEBUG and ASSERT_DISABLED usually go hand in hand, but sometimes people do use release builds with assertions enabled, and this code will fail to build in this configuration. A better way to fix this is to change NDEBUG #ifs to ASSERT_DISABLED ones elsewhere in this file. 896708 5 203647 kangil.han 2013-06-03 19:45:51 -0700 Created attachment 203647 Patch 896709 6 kangil.han 2013-06-03 19:46:51 -0700 (In reply to comment #4) > (From update of attachment 203586 [details]) > You are right that the code is not quite correct - NDEBUG and ASSERT_DISABLED usually go hand in hand, but sometimes people do use release builds with assertions enabled, and this code will fail to build in this configuration. > > A better way to fix this is to change NDEBUG #ifs to ASSERT_DISABLED ones elsewhere in this file. Took ap's comment into consideration. 896747 7 203647 ap 2013-06-03 23:16:56 -0700 Comment on attachment 203647 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203647&action=review > Source/WebCore/rendering/InlineBox.cpp:35 > -#ifndef NDEBUG > +#if !ASSERT_DISABLED > #include <stdio.h> > #endif stdio.h is needed for code below that is genuinely DEBUG-specific, so this change is not correct. > Source/WebCore/rendering/InlineBox.cpp:95 > +#if !ASSERT_DISABLED > ASSERT(inInlineBoxDetach); > - > +#endif This instance doesn't need to be guarded - ASSERT macro itself has the check. > Source/WebCore/rendering/InlineBox.cpp:101 > -#ifndef NDEBUG > +#if !ASSERT_DISABLED > const char* InlineBox::boxName() const These functions are DEBUG specific, they are not related to assertions at all. So, NDEBUG was correct here. > Source/WebCore/rendering/InlineBox.cpp:395 > -#ifndef NDEBUG > +#if !ASSERT_DISABLED Ditto. > Source/WebCore/rendering/InlineBox.h:111 > -#ifndef NDEBUG > +#if !ASSERT_DISABLED Ditto. > Source/WebCore/rendering/InlineBox.h:439 > -#ifndef NDEBUG > +#if !ASSERT_DISABLED Ditto. 896751 8 203656 kangil.han 2013-06-03 23:55:53 -0700 Created attachment 203656 Patch 896752 9 kangil.han 2013-06-03 23:56:30 -0700 Thanks for the review and took ap's comment into consideration. :) 896805 10 203656 commit-queue 2013-06-04 03:26:50 -0700 Comment on attachment 203656 Patch Clearing flags on attachment: 203656 Committed r151164: <http://trac.webkit.org/changeset/151164> 896806 11 commit-queue 2013-06-04 03:26:53 -0700 All reviewed patches have been landed. Closing bug. 203586 2013-06-03 07:21:23 -0700 2013-06-03 19:45:45 -0700 Patch bug-117146-20130603231954.patch text/plain 1275 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ2MzEwMzdjMDliZDRi Zjc3NGI4M2ExY2JlNmJlNWRiYTZiYzY2Mi4uMmFjOGIyNzkxODBjNmYzNWI4MjZhYmJlNGQ1MTlk MGM0ZTA4NjAxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTAzICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBBZGQgb21pdHRlZCBO REVCVUcgb3B0aW9uIGluIElubGluZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTkRFQlVHIG9wdGlvbiBpcyBuZWVkZWQgZm9yIGFueSBpbklubGlu ZUJveERldGFjaCB1c2FnZS4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVCb3guY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lQm94OjpvcGVyYXRvciBkZWxldGUpOgorCiAyMDEzLTA1 LTIyICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKICAg ICAgICAgW1F0XSBSZS1lbmFibGUgcGx1Z2lucyBvbiBNYWMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVCb3guY3BwCmluZGV4IDdmMzZmNzc3ZjVjYTFmMjQzYjUxNTdiOWJlZDJkNmFhMWNk NDRkM2IuLjc2MjBiNDVlYWEwMTU0MDU2Mzg3YWFiYjU5MWU1MDc3NWQxYjJmMWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVCb3guY3BwCkBAIC05Miw3ICs5Miw5IEBAIHZvaWQqIElu bGluZUJveDo6b3BlcmF0b3IgbmV3KHNpemVfdCBzeiwgUmVuZGVyQXJlbmEqIHJlbmRlckFyZW5h KQogCiB2b2lkIElubGluZUJveDo6b3BlcmF0b3IgZGVsZXRlKHZvaWQqIHB0ciwgc2l6ZV90IHN6 KQogeworI2lmbmRlZiBOREVCVUcKICAgICBBU1NFUlQoaW5JbmxpbmVCb3hEZXRhY2gpOworI2Vu ZGlmCiAKICAgICAvLyBTdGFzaCBzaXplIHdoZXJlIGRlc3Ryb3kgY2FuIGZpbmQgaXQuCiAgICAg KihzaXplX3QgKilwdHIgPSBzejsK 203647 2013-06-03 19:45:51 -0700 2013-06-03 23:55:49 -0700 Patch bug-117146-20130604114422.patch text/plain 4849 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTdjNTI1YmYyMDJjMmRj NDUwOTQwZWVkN2I5NGVkNmU4NGFjNzc5Yy4uZDE4OTgyMGQ3Yzg1MzMwNzA2OWI5NDhhNmY5Njgy MzEzODU5MzcwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA2LTAzICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXBsYWNlIHVzZSBv ZiBOREVCVUcgb3B0aW9uIHdpdGggQVNTRVJUX0RJU0FCTEVEIGluIElubGluZUJveAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTQ2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG9taXR0ZWQgZGVi dWcgb3B0aW9uIGFyb3VuZCBpbklubGluZUJveERldGFjaCBhbmQgcmVwbGFjZSBOREVCVUcgd2l0 aCBBU1NFUlRfRElTQUJMRUQgdG8gcHJldmVudCBidWlsZCBlcnJvciBmcm9tIGFzc2VydGlvbiB1 c2FnZSBhbG9uZyB3aXRoIHJlbGVhc2UgYnVpbGQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5s aW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUJveDo6fklubGluZUJveCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVCb3g6OmRlc3Ryb3kpOgorICAgICAgICAoV2ViQ29yZTo6 SW5saW5lQm94OjpvcGVyYXRvciBkZWxldGUpOgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVC b3guaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUJveDo6SW5saW5lQm94KToKKwogMjAxMy0w Ni0wMyAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAgIGNsZWFy TGF5b3V0T3ZlcmZsb3cgc2hvdWxkIG5ldmVyIGJlIGNhbGxlZCBiZWZvcmUgY2FsbGluZyBsYXll cigpLT51cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZUJveC5jcHAKaW5kZXggN2YzNmY3NzdmNWNhMWYyNDNiNTE1N2I5YmVkMmQ2YWExY2Q0 NGQzYi4uYzQ1NWFkYzIzMTE1NGJmNjVmNTJhYzBlNTk5YjUxOTg4ZDBhNGFhNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRl ICJSZW5kZXJCbG9jay5oIgogI2luY2x1ZGUgIlJvb3RJbmxpbmVCb3guaCIKIAotI2lmbmRlZiBO REVCVUcKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiAjaW5jbHVkZSA8c3RkaW8uaD4KICNlbmRpZgog CkBAIC00NCwyNSArNDQsMjMgQEAgc3RydWN0IFNhbWVTaXplQXNJbmxpbmVCb3ggewogICAgIEZs b2F0UG9pbnQgYjsKICAgICBmbG9hdCBjOwogICAgIHVpbnQzMl90IGQgOiAzMjsKLSNpZm5kZWYg TkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGJvb2wgZjsKICNlbmRpZgogfTsKIAog Q09NUElMRV9BU1NFUlQoc2l6ZW9mKElubGluZUJveCkgPT0gc2l6ZW9mKFNhbWVTaXplQXNJbmxp bmVCb3gpLCBJbmxpbmVCb3hfc2l6ZV9ndWFyZCk7CiAKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFT U0VSVF9ESVNBQkxFRAogc3RhdGljIGJvb2wgaW5JbmxpbmVCb3hEZXRhY2g7CiAjZW5kaWYKIAot I2lmbmRlZiBOREVCVUcKLQorI2lmICFBU1NFUlRfRElTQUJMRUQKIElubGluZUJveDo6fklubGlu ZUJveCgpCiB7CiAgICAgaWYgKCFtX2hhc0JhZFBhcmVudCAmJiBtX3BhcmVudCkKICAgICAgICAg bV9wYXJlbnQtPnNldEhhc0JhZENoaWxkTGlzdCgpOwogfQotCiAjZW5kaWYKIAogdm9pZCBJbmxp bmVCb3g6OnJlbW92ZSgpCkBAIC03MywxMSArNzEsMTEgQEAgdm9pZCBJbmxpbmVCb3g6OnJlbW92 ZSgpCiAKIHZvaWQgSW5saW5lQm94OjpkZXN0cm95KFJlbmRlckFyZW5hKiByZW5kZXJBcmVuYSkK IHsKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGluSW5saW5lQm94 RGV0YWNoID0gdHJ1ZTsKICNlbmRpZgogICAgIGRlbGV0ZSB0aGlzOwotI2lmbmRlZiBOREVCVUcK KyNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgaW5JbmxpbmVCb3hEZXRhY2ggPSBmYWxzZTsKICNl bmRpZgogCkBAIC05MiwxMyArOTAsMTQgQEAgdm9pZCogSW5saW5lQm94OjpvcGVyYXRvciBuZXco c2l6ZV90IHN6LCBSZW5kZXJBcmVuYSogcmVuZGVyQXJlbmEpCiAKIHZvaWQgSW5saW5lQm94Ojpv cGVyYXRvciBkZWxldGUodm9pZCogcHRyLCBzaXplX3Qgc3opCiB7CisjaWYgIUFTU0VSVF9ESVNB QkxFRAogICAgIEFTU0VSVChpbklubGluZUJveERldGFjaCk7Ci0KKyNlbmRpZgogICAgIC8vIFN0 YXNoIHNpemUgd2hlcmUgZGVzdHJveSBjYW4gZmluZCBpdC4KICAgICAqKHNpemVfdCAqKXB0ciA9 IHN6OwogfQogCi0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJMRUQKIGNvbnN0IGNo YXIqIElubGluZUJveDo6Ym94TmFtZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuICJJbmxpbmVCb3gi OwpAQCAtMzkzLDcgKzM5Miw3IEBAIExheW91dFBvaW50IElubGluZUJveDo6ZmxpcEZvcldyaXRp bmdNb2RlKGNvbnN0IExheW91dFBvaW50JiBwb2ludCkKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogCi0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJMRUQKIAogdm9pZCBzaG93VHJl ZShjb25zdCBXZWJDb3JlOjpJbmxpbmVCb3gqIGIpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lQm94LmgKaW5kZXggZTJjZjg1ZmRjOGEwNDY0N2VmNWQzMjhmMTljYzA1ZDUxOGQ0ZDY1OC4u MDNiOTdjYWRhZjI0YzQ0ODM4ZTIyMDhhODFmMDE0MDJlOTE3ZTExNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9JbmxpbmVCb3guaApAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgICAgICwg bV9wYXJlbnQoMCkKICAgICAgICAgLCBtX3JlbmRlcmVyKG9iaikKICAgICAgICAgLCBtX2xvZ2lj YWxXaWR0aCgwKQotI2lmbmRlZiBOREVCVUcKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgICAg ICwgbV9oYXNCYWRQYXJlbnQoZmFsc2UpCiAjZW5kaWYKICAgICB7CkBAIC01NSw3ICs1NSw3IEBA IHB1YmxpYzoKICAgICAgICAgLCBtX3RvcExlZnQodG9wTGVmdCkKICAgICAgICAgLCBtX2xvZ2lj YWxXaWR0aChsb2dpY2FsV2lkdGgpCiAgICAgICAgICwgbV9iaXRmaWVsZHMoZmlyc3RMaW5lLCBj b25zdHJ1Y3RlZCwgZGlydHksIGV4dHJhY3RlZCwgaXNIb3Jpem9udGFsKQotI2lmbmRlZiBOREVC VUcKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgICAgICwgbV9oYXNCYWRQYXJlbnQoZmFsc2Up CiAjZW5kaWYKICAgICB7CkBAIC0xMDgsNyArMTA4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkKiBv cGVyYXRvciBuZXcoc2l6ZV90KSB0aHJvdygpOwogCiBwdWJsaWM6Ci0jaWZuZGVmIE5ERUJVRwor I2lmICFBU1NFUlRfRElTQUJMRUQKICAgICB2b2lkIHNob3dUcmVlRm9yVGhpcygpIGNvbnN0Owog ICAgIHZvaWQgc2hvd0xpbmVUcmVlRm9yVGhpcygpIGNvbnN0OwogICAgIApAQCAtMjcyLDcgKzI3 Miw3IEBAIHB1YmxpYzoKICAgICAvLyB2aXNpYmxlTGVmdEVkZ2UsIHZpc2libGVSaWdodEVkZ2Ug YXJlIGluIHRoZSBwYXJlbnQncyBjb29yZGluYXRlIHN5c3RlbS4KICAgICB2aXJ0dWFsIGZsb2F0 IHBsYWNlRWxsaXBzaXNCb3goYm9vbCBsdHIsIGZsb2F0IHZpc2libGVMZWZ0RWRnZSwgZmxvYXQg dmlzaWJsZVJpZ2h0RWRnZSwgZmxvYXQgZWxsaXBzaXNXaWR0aCwgZmxvYXQgJnRydW5jYXRlZFdp ZHRoLCBib29sJik7CiAKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAg IHZvaWQgc2V0SGFzQmFkUGFyZW50KCk7CiAjZW5kaWYKIApAQCAtNDE1LDE5ICs0MTUsMTkgQEAg cHJvdGVjdGVkOgogICAgIC8vIEZvciBJbmxpbmVGbG93Qm94IGFuZCBJbmxpbmVUZXh0Qm94CiAg ICAgYm9vbCBleHRyYWN0ZWQoKSBjb25zdCB7IHJldHVybiBtX2JpdGZpZWxkcy5leHRyYWN0ZWQo KTsgfQogCi0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJMRUQKIHByaXZhdGU6CiAg ICAgYm9vbCBtX2hhc0JhZFBhcmVudDsKICNlbmRpZgogfTsKIAotI2lmZGVmIE5ERUJVRworI2lm IEFTU0VSVF9ESVNBQkxFRAogaW5saW5lIElubGluZUJveDo6fklubGluZUJveCgpCiB7CiB9CiAj ZW5kaWYKIAotI2lmbmRlZiBOREVCVUcKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiBpbmxpbmUgdm9p ZCBJbmxpbmVCb3g6OnNldEhhc0JhZFBhcmVudCgpCiB7CiAgICAgbV9oYXNCYWRQYXJlbnQgPSB0 cnVlOwpAQCAtNDM2LDcgKzQzNiw3IEBAIGlubGluZSB2b2lkIElubGluZUJveDo6c2V0SGFzQmFk UGFyZW50KCkKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0jaWZuZGVmIE5ERUJVRworI2lm ICFBU1NFUlRfRElTQUJMRUQKIC8vIE91dHNpZGUgdGhlIFdlYkNvcmUgbmFtZXNwYWNlIGZvciBl YXNlIG9mIGludm9jYXRpb24gZnJvbSBnZGIuCiB2b2lkIHNob3dUcmVlKGNvbnN0IFdlYkNvcmU6 OklubGluZUJveCopOwogdm9pZCBzaG93TGluZVRyZWUoY29uc3QgV2ViQ29yZTo6SW5saW5lQm94 Kik7Cg== 203656 2013-06-03 23:55:53 -0700 2013-06-04 03:26:50 -0700 Patch bug-117146-20130604155425.patch text/plain 3824 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTBhMzdiMzY2MmU3Nzkw Y2YyZjExYzhjZjU5OTVkY2JiZGUzMmNiMy4uNDJiNmViNTM3N2I3ZmVmYzdlZjUxYzdhYzAwNDJk MGRlM2U0YmE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEzLTA2LTAzICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAorICAgICAgICBVc2UgQVNTRVJUX0RJ U0FCTEVEIG9wdGlvbiBmb3IgYXNzZXJ0aW9uIHB1cnBvc2UgY29kZSBpbiBJbmxpbmVCb3gKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzE0NgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGNhbiBkaXN0 aW5ndWlzaCBhc3NlcnRpb24gY29kZSB3aXRoIGRlYnVnIHB1cnBvc2UgYnkgdXNpbmcgQVNTRVJU X0RJU0FCTEVEIG9wdGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVCb3guY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lQm94Ojp+SW5saW5lQm94KToKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUJveDo6ZGVzdHJveSk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVCb3g6Om9w ZXJhdG9yIGRlbGV0ZSk6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUJveC5oOgorICAgICAg ICAoV2ViQ29yZTo6SW5saW5lQm94OjpJbmxpbmVCb3gpOgorCisyMDEzLTA2LTAzICBLYW5naWwg SGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKwogICAgICAgICBSZW1vdmUgdW51c2VkIGFy aXRobWV0aWMgb3BlcmF0aW9uIGluIFJlbmRlckxpc3RJdGVtCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcxNzUKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lQm94LmNwcAppbmRleCA3ZjM2Zjc3N2Y1Y2ExZjI0M2I1MTU3YjliZWQyZDZhYTFj ZDQ0ZDNiLi44ODM0OTBiMzc4MjE4MWMxMDMzMmU0MjdjMTU4NjAwMmRkOGVmNjg1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmNwcApAQCAtNDQsMjUgKzQ0LDIzIEBAIHN0cnVj dCBTYW1lU2l6ZUFzSW5saW5lQm94IHsKICAgICBGbG9hdFBvaW50IGI7CiAgICAgZmxvYXQgYzsK ICAgICB1aW50MzJfdCBkIDogMzI7Ci0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJM RUQKICAgICBib29sIGY7CiAjZW5kaWYKIH07CiAKIENPTVBJTEVfQVNTRVJUKHNpemVvZihJbmxp bmVCb3gpID09IHNpemVvZihTYW1lU2l6ZUFzSW5saW5lQm94KSwgSW5saW5lQm94X3NpemVfZ3Vh cmQpOwogCi0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJMRUQKIHN0YXRpYyBib29s IGluSW5saW5lQm94RGV0YWNoOwogI2VuZGlmCiAKLSNpZm5kZWYgTkRFQlVHCi0KKyNpZiAhQVNT RVJUX0RJU0FCTEVECiBJbmxpbmVCb3g6On5JbmxpbmVCb3goKQogewogICAgIGlmICghbV9oYXNC YWRQYXJlbnQgJiYgbV9wYXJlbnQpCiAgICAgICAgIG1fcGFyZW50LT5zZXRIYXNCYWRDaGlsZExp c3QoKTsKIH0KLQogI2VuZGlmCiAKIHZvaWQgSW5saW5lQm94OjpyZW1vdmUoKQpAQCAtNzMsMTEg KzcxLDExIEBAIHZvaWQgSW5saW5lQm94OjpyZW1vdmUoKQogCiB2b2lkIElubGluZUJveDo6ZGVz dHJveShSZW5kZXJBcmVuYSogcmVuZGVyQXJlbmEpCiB7Ci0jaWZuZGVmIE5ERUJVRworI2lmICFB U1NFUlRfRElTQUJMRUQKICAgICBpbklubGluZUJveERldGFjaCA9IHRydWU7CiAjZW5kaWYKICAg ICBkZWxldGUgdGhpczsKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAg IGluSW5saW5lQm94RGV0YWNoID0gZmFsc2U7CiAjZW5kaWYKIApAQCAtOTMsNyArOTEsNiBAQCB2 b2lkKiBJbmxpbmVCb3g6Om9wZXJhdG9yIG5ldyhzaXplX3Qgc3osIFJlbmRlckFyZW5hKiByZW5k ZXJBcmVuYSkKIHZvaWQgSW5saW5lQm94OjpvcGVyYXRvciBkZWxldGUodm9pZCogcHRyLCBzaXpl X3Qgc3opCiB7CiAgICAgQVNTRVJUKGluSW5saW5lQm94RGV0YWNoKTsKLQogICAgIC8vIFN0YXNo IHNpemUgd2hlcmUgZGVzdHJveSBjYW4gZmluZCBpdC4KICAgICAqKHNpemVfdCAqKXB0ciA9IHN6 OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5oCmluZGV4IGUyY2Y4NWZkYzhhMDQ2 NDdlZjVkMzI4ZjE5Y2MwNWQ1MThkNGQ2NTguLjJmNDgwYzhhOThjYjliZDQ4MWEwMzFiMTFlMDA5 MmY4NDRkMzM1MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVC b3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmgKQEAgLTQwLDcg KzQwLDcgQEAgcHVibGljOgogICAgICAgICAsIG1fcGFyZW50KDApCiAgICAgICAgICwgbV9yZW5k ZXJlcihvYmopCiAgICAgICAgICwgbV9sb2dpY2FsV2lkdGgoMCkKLSNpZm5kZWYgTkRFQlVHCisj aWYgIUFTU0VSVF9ESVNBQkxFRAogICAgICAgICAsIG1faGFzQmFkUGFyZW50KGZhbHNlKQogI2Vu ZGlmCiAgICAgewpAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgbV90b3BMZWZ0 KHRvcExlZnQpCiAgICAgICAgICwgbV9sb2dpY2FsV2lkdGgobG9naWNhbFdpZHRoKQogICAgICAg ICAsIG1fYml0ZmllbGRzKGZpcnN0TGluZSwgY29uc3RydWN0ZWQsIGRpcnR5LCBleHRyYWN0ZWQs IGlzSG9yaXpvbnRhbCkKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAg ICAgICAsIG1faGFzQmFkUGFyZW50KGZhbHNlKQogI2VuZGlmCiAgICAgewpAQCAtMjcyLDcgKzI3 Miw3IEBAIHB1YmxpYzoKICAgICAvLyB2aXNpYmxlTGVmdEVkZ2UsIHZpc2libGVSaWdodEVkZ2Ug YXJlIGluIHRoZSBwYXJlbnQncyBjb29yZGluYXRlIHN5c3RlbS4KICAgICB2aXJ0dWFsIGZsb2F0 IHBsYWNlRWxsaXBzaXNCb3goYm9vbCBsdHIsIGZsb2F0IHZpc2libGVMZWZ0RWRnZSwgZmxvYXQg dmlzaWJsZVJpZ2h0RWRnZSwgZmxvYXQgZWxsaXBzaXNXaWR0aCwgZmxvYXQgJnRydW5jYXRlZFdp ZHRoLCBib29sJik7CiAKLSNpZm5kZWYgTkRFQlVHCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAg IHZvaWQgc2V0SGFzQmFkUGFyZW50KCk7CiAjZW5kaWYKIApAQCAtNDE1LDE5ICs0MTUsMTkgQEAg cHJvdGVjdGVkOgogICAgIC8vIEZvciBJbmxpbmVGbG93Qm94IGFuZCBJbmxpbmVUZXh0Qm94CiAg ICAgYm9vbCBleHRyYWN0ZWQoKSBjb25zdCB7IHJldHVybiBtX2JpdGZpZWxkcy5leHRyYWN0ZWQo KTsgfQogCi0jaWZuZGVmIE5ERUJVRworI2lmICFBU1NFUlRfRElTQUJMRUQKIHByaXZhdGU6CiAg ICAgYm9vbCBtX2hhc0JhZFBhcmVudDsKICNlbmRpZgogfTsKIAotI2lmZGVmIE5ERUJVRworI2lm IEFTU0VSVF9ESVNBQkxFRAogaW5saW5lIElubGluZUJveDo6fklubGluZUJveCgpCiB7CiB9CiAj ZW5kaWYKIAotI2lmbmRlZiBOREVCVUcKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiBpbmxpbmUgdm9p ZCBJbmxpbmVCb3g6OnNldEhhc0JhZFBhcmVudCgpCiB7CiAgICAgbV9oYXNCYWRQYXJlbnQgPSB0 cnVlOwo=