173622 2017-06-20 15:39:53 -0700 reinterpret_cast does not evaluate to constexpr 2017-10-16 19:41:12 -0700 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143310 1 daewoong.jang daewoong.jang achristensen buildbot commit-queue fpizlo fujii ggaren jfbastien ysuzuki oldest_to_newest 1321262 0 daewoong.jang 2017-06-20 15:39:53 -0700 MSVC does not evaluate reinterpret_cast as a constant expression. This change is needed for supporting bmalloc on Windows(https://bugs.webkit.org/show_bug.cgi?id=143310). 1321264 1 313445 daewoong.jang 2017-06-20 15:41:45 -0700 Created attachment 313445 patch 1321276 2 buildbot 2017-06-20 15:56:44 -0700 Attachment 313445 did not pass style-queue: ERROR: Source/bmalloc/bmalloc/Algorithm.h:55: bitwise_cast is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1321643 3 313554 daewoong.jang 2017-06-21 15:10:30 -0700 Created attachment 313554 patch 1321645 4 buildbot 2017-06-21 15:13:22 -0700 Attachment 313554 did not pass style-queue: ERROR: Source/bmalloc/bmalloc/Algorithm.h:56: bitwise_cast is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1321816 5 ysuzuki 2017-06-22 03:02:55 -0700 IIRC, std::memcpy is not constexpr in C++14. And reinterpret_cast is so too. Thus, we cannot use this thing as constexpr. I think we should prepare two versions of this function by overriding. One for T*, and one for T. And in T case, we do not perform reinterpret_cast<>. Instead, we will use static_cast<uintptr_t>(). In that case, we can make it as constexpr. Because this roundUpToMultipleOf is sometimes used for size_t, this enforces compilers to calculate constant values for that case (with constant values). And in the case of T*, we will just use reinterpret_cast<>. And we do not annotate constexpr for that. 1321817 6 ysuzuki 2017-06-22 03:03:49 -0700 (In reply to Yusuke Suzuki from comment #5) > IIRC, std::memcpy is not constexpr in C++14. And reinterpret_cast is so too. > Thus, we cannot use this thing as constexpr. We need to wait http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0202r0.html integration to the spec. > > I think we should prepare two versions of this function by overriding. > One for T*, and one for T. > And in T case, we do not perform reinterpret_cast<>. Instead, we will use > static_cast<uintptr_t>(). In that case, we can make it as constexpr. > Because this roundUpToMultipleOf is sometimes used for size_t, this enforces > compilers to calculate constant values for that case (with constant values). > > And in the case of T*, we will just use reinterpret_cast<>. And we do not > annotate constexpr for that. 1321839 7 313610 daewoong.jang 2017-06-22 05:44:20 -0700 Created attachment 313610 patch 1321855 8 daewoong.jang 2017-06-22 07:03:32 -0700 (In reply to Yusuke Suzuki from comment #5) > IIRC, std::memcpy is not constexpr in C++14. And reinterpret_cast is so too. > Thus, we cannot use this thing as constexpr. > > I think we should prepare two versions of this function by overriding. > One for T*, and one for T. > And in T case, we do not perform reinterpret_cast<>. Instead, we will use > static_cast<uintptr_t>(). In that case, we can make it as constexpr. > Because this roundUpToMultipleOf is sometimes used for size_t, this enforces > compilers to calculate constant values for that case (with constant values). > > And in the case of T*, we will just use reinterpret_cast<>. And we do not > annotate constexpr for that. I updated the patch as you suggested. Thanks! 1321917 9 313610 jfbastien 2017-06-22 09:11:31 -0700 Comment on attachment 313610 patch View in context: https://bugs.webkit.org/attachment.cgi?id=313610&action=review > We need to wait http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0202r0.html integration to the spec. Unfortunately the committee is split on whether memcpy should be constexpr. I think http://wg21.link/p0476 may get you what you want... if the committee agrees to constexpr. > Source/bmalloc/bmalloc/Algorithm.h:51 > template<typename T> inline constexpr T mask(T value, uintptr_t mask) Which types do we expect to get for T here? Are they all valid? Is widening or narrowing OK? I would use enable_if to check invariants are met. > Source/bmalloc/bmalloc/Algorithm.h:71 > template<typename T> inline T roundUpToMultipleOf(size_t divisor, T x) Ditto on T. 1321929 10 313610 ggaren 2017-06-22 09:39:39 -0700 Comment on attachment 313610 patch What function requires mask() or roundUpToMultipleOf to be constexpr? Can we make them not constexpr? 1322094 11 daewoong.jang 2017-06-22 15:40:33 -0700 (In reply to Geoffrey Garen from comment #10) > Comment on attachment 313610 [details] > patch > > What function requires mask() or roundUpToMultipleOf to be constexpr? Can we > make them not constexpr? It seems that constexpr at roundUpToMultipleOf() could be removed, but mask() needs to be constexpr due to Sizes::maskSizeClass(). And reinterpret_cast still couldn't be used as MSVC is complaining that "cannot convert from std::size_t to uintptr_t". If you think the constexpr of roundUpToMultipleOf() should be removed, I'll update the patch. >> Source/bmalloc/bmalloc/Algorithm.h:51 >> template<typename T> inline constexpr T mask(T value, uintptr_t mask) >Which types do we expect to get for T here? Are they all valid? Is widening or >narrowing OK? I would use enable_if to check invariants are met. >> Source/bmalloc/bmalloc/Algorithm.h:71 >> template<typename T> inline T roundUpToMultipleOf(size_t divisor, T x) >Ditto on T. Regarding Bastien's review, could you let me know which types are valid and which are not? Thank you for review. 1325537 12 313610 ysuzuki 2017-07-04 23:10:58 -0700 Comment on attachment 313610 patch View in context: https://bugs.webkit.org/attachment.cgi?id=313610&action=review >>> Source/bmalloc/bmalloc/Algorithm.h:51 >>> template<typename T> inline constexpr T mask(T value, uintptr_t mask) >> >> Which types do we expect to get for T here? Are they all valid? Is widening or narrowing OK? I would use enable_if to check invariants are met. > > The original code using reinterpret_cast requires that it does not cause any widening and narrowing. Let's add `static_assert(sizeof(T) == sizeof(uintptr_t), "");` in this function. >>> Source/bmalloc/bmalloc/Algorithm.h:71 >>> template<typename T> inline T roundUpToMultipleOf(size_t divisor, T x) >> >> Ditto on T. > > Ditto. Let's add `static_assert(sizeof(T) == sizeof(uintptr_t), "");`. 1325803 13 314660 daewoong.jang 2017-07-05 15:58:01 -0700 Created attachment 314660 patch 1325835 14 daewoong.jang 2017-07-05 17:00:58 -0700 I think the patch is got a lot better. Thanks! 1325867 15 314660 ysuzuki 2017-07-05 19:02:07 -0700 Comment on attachment 314660 patch r=me 1325889 16 314660 commit-queue 2017-07-05 19:30:43 -0700 Comment on attachment 314660 patch Clearing flags on attachment: 314660 Committed r219181: <http://trac.webkit.org/changeset/219181> 1325890 17 commit-queue 2017-07-05 19:30:45 -0700 All reviewed patches have been landed. Closing bug. 1360905 18 314660 fpizlo 2017-10-16 12:51:11 -0700 Comment on attachment 314660 patch View in context: https://bugs.webkit.org/attachment.cgi?id=314660&action=review > Source/bmalloc/bmalloc/Algorithm.h:53 > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); What is the purpose of this assertion? > Source/bmalloc/bmalloc/Algorithm.h:75 > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); What is the purpose of this assertion? 1361013 19 daewoong.jang 2017-10-16 16:43:20 -0700 (In reply to Filip Pizlo from comment #18) > Comment on attachment 314660 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=314660&action=review > > > Source/bmalloc/bmalloc/Algorithm.h:53 > > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); > > What is the purpose of this assertion? > > > Source/bmalloc/bmalloc/Algorithm.h:75 > > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); > > What is the purpose of this assertion? Please refer to comment #9 and #12. 1361069 20 fpizlo 2017-10-16 19:41:12 -0700 (In reply to Daewoong Jang from comment #19) > (In reply to Filip Pizlo from comment #18) > > Comment on attachment 314660 [details] > > patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=314660&action=review > > > > > Source/bmalloc/bmalloc/Algorithm.h:53 > > > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); > > > > What is the purpose of this assertion? > > > > > Source/bmalloc/bmalloc/Algorithm.h:75 > > > + static_assert(sizeof(T) == sizeof(uintptr_t), "sizeof(T) must be equal to sizeof(uintptr_t)."); > > > > What is the purpose of this assertion? > > Please refer to comment #9 and #12. Thanks. In the future, it would be useful to put information about this in the ChangeLog. 313445 2017-06-20 15:41:45 -0700 2017-06-21 15:10:30 -0700 patch bug173622.diff text/plain 2157 daewoong.jang SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODYwOSkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA2LTIwICBEYWV3b29u ZyBKYW5nICA8ZGFld29vbmcuamFuZ0BuYXZlcmNvcnAuY29tPgorCisgICAgICAgIFJlcGxhY2Ug cmVpbnRlcnByZXRfY2FzdCB3aXRoIGJpdHdpc2VfY2FzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzYyMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYm1hbGxvYy9BbGdvcml0aG0uaDoKKyAgICAg ICAgKGJtYWxsb2M6OmJpdHdpc2VfY2FzdCk6IENvcGllZCBmcm9tIHd0Zi9TdGRMaWJFeHRyYXMu aC4KKyAgICAgICAgKGJtYWxsb2M6Om1hc2spOgorICAgICAgICAoYm1hbGxvYzo6cm91bmRVcFRv TXVsdGlwbGVPZik6CisKIDIwMTctMDYtMTAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZlcnRlZCByMjE4MDU2IGJlY2F1c2UgaXQgbWFkZSB0aGUgSURFIHJl aW5kZXggY29uc3RhbnRseS4KSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxnb3JpdGht LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0uaAkocmV2 aXNpb24gMjE4NjA5KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0uaAkod29y a2luZyBjb3B5KQpAQCAtNDgsOSArNDgsMjEgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5l IGNvbnN0ZXhwciBUCiAgICAgcmV0dXJuIGEgPCBiID8gYSA6IGI7CiB9CiAKKy8qCisgKiBDKysn cyBpZGVhIG9mIGEgcmVpbnRlcnByZXRfY2FzdCBsYWNrcyBzdWZmaWNpZW50IGNvam9uZXMuCisg Ki8KK3RlbXBsYXRlPHR5cGVuYW1lIFRvVHlwZSwgdHlwZW5hbWUgRnJvbVR5cGU+CitpbmxpbmUg VG9UeXBlIGJpdHdpc2VfY2FzdChGcm9tVHlwZSBmcm9tKQoreworICAgIHN0YXRpY19hc3NlcnQo c2l6ZW9mKEZyb21UeXBlKSA9PSBzaXplb2YoVG9UeXBlKSwgImJpdHdpc2VfY2FzdCBzaXplIG9m IEZyb21UeXBlIGFuZCBUb1R5cGUgbXVzdCBiZSBlcXVhbCEiKTsKKyAgICB0eXBlbmFtZSBzdGQ6 OnJlbW92ZV9jb25zdDxUb1R5cGU+Ojp0eXBlIHRvIHsgfTsKKyAgICBzdGQ6Om1lbWNweSgmdG8s ICZmcm9tLCBzaXplb2YodG8pKTsKKyAgICByZXR1cm4gdG87Cit9CisKIHRlbXBsYXRlPHR5cGVu YW1lIFQ+IGlubGluZSBjb25zdGV4cHIgVCBtYXNrKFQgdmFsdWUsIHVpbnRwdHJfdCBtYXNrKQog ewotICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFQ+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0 cl90Pih2YWx1ZSkgJiBtYXNrKTsKKyAgICByZXR1cm4gYml0d2lzZV9jYXN0PFQ+KGJpdHdpc2Vf Y2FzdDx1aW50cHRyX3Q+KHZhbHVlKSAmIG1hc2spOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBU PiBpbmxpbmUgY29uc3RleHByIGJvb2wgdGVzdChUIHZhbHVlLCB1aW50cHRyX3QgbWFzaykKQEAg LTY2LDcgKzc4LDcgQEAgaW5saW5lIGNvbnN0ZXhwciBib29sIGlzUG93ZXJPZlR3byhzaXplXwog dGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQgcm91bmRVcFRvTXVsdGlwbGVPZihzaXplX3Qg ZGl2aXNvciwgVCB4KQogewogICAgIEJBU1NFUlQoaXNQb3dlck9mVHdvKGRpdmlzb3IpKTsKLSAg ICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUPigocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+ KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRpdmlzb3IgLSAxKSk7CisgICAgcmV0dXJuIGJpdHdp c2VfY2FzdDxUPigoYml0d2lzZV9jYXN0PHVpbnRwdHJfdD4oeCkgKyAoZGl2aXNvciAtIDEpKSAm IH4oZGl2aXNvciAtIDEpKTsKIH0KIAogdGVtcGxhdGU8c2l6ZV90IGRpdmlzb3IsIHR5cGVuYW1l IFQ+IGlubGluZSBjb25zdGV4cHIgVCByb3VuZFVwVG9NdWx0aXBsZU9mKFQgeCkK 313554 2017-06-21 15:10:30 -0700 2017-06-22 05:44:20 -0700 patch bug173622.diff text/plain 2319 daewoong.jang SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODYwOSkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA2LTIwICBEYWV3b29u ZyBKYW5nICA8ZGFld29vbmcuamFuZ0BuYXZlcmNvcnAuY29tPgorCisgICAgICAgIFJlcGxhY2Ug cmVpbnRlcnByZXRfY2FzdCB3aXRoIGJpdHdpc2VfY2FzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzYyMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYm1hbGxvYy9BbGdvcml0aG0uaDoKKyAgICAg ICAgKGJtYWxsb2M6OmJpdHdpc2VfY2FzdCk6IENvcGllZCBmcm9tIHd0Zi9TdGRMaWJFeHRyYXMu aC4KKyAgICAgICAgKGJtYWxsb2M6Om1hc2spOgorICAgICAgICAoYm1hbGxvYzo6cm91bmRVcFRv TXVsdGlwbGVPZik6CisKIDIwMTctMDYtMTAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZlcnRlZCByMjE4MDU2IGJlY2F1c2UgaXQgbWFkZSB0aGUgSURFIHJl aW5kZXggY29uc3RhbnRseS4KSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxnb3JpdGht LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0uaAkocmV2 aXNpb24gMjE4NjA5KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0uaAkod29y a2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgPGFsZ29yaXRobT4KICNpbmNs dWRlIDxjc3RkaW50PgogI2luY2x1ZGUgPGNzdGRkZWY+CisjaW5jbHVkZSA8Y3N0cmluZz4KICNp bmNsdWRlIDxsaW1pdHM+CiAjaW5jbHVkZSA8dHlwZV90cmFpdHM+CiAjaW5jbHVkZSA8Y2hyb25v PgpAQCAtNDgsOSArNDksMjEgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIGNvbnN0ZXhw ciBUCiAgICAgcmV0dXJuIGEgPCBiID8gYSA6IGI7CiB9CiAKKy8qCisgKiBDKysncyBpZGVhIG9m IGEgcmVpbnRlcnByZXRfY2FzdCBsYWNrcyBzdWZmaWNpZW50IGNvam9uZXMuCisgKi8KK3RlbXBs YXRlPHR5cGVuYW1lIFRvVHlwZSwgdHlwZW5hbWUgRnJvbVR5cGU+CitpbmxpbmUgVG9UeXBlIGJp dHdpc2VfY2FzdChGcm9tVHlwZSBmcm9tKQoreworICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKEZy b21UeXBlKSA9PSBzaXplb2YoVG9UeXBlKSwgImJpdHdpc2VfY2FzdCBzaXplIG9mIEZyb21UeXBl IGFuZCBUb1R5cGUgbXVzdCBiZSBlcXVhbCEiKTsKKyAgICB0eXBlbmFtZSBzdGQ6OnJlbW92ZV9j b25zdDxUb1R5cGU+Ojp0eXBlIHRvIHsgfTsKKyAgICBzdGQ6Om1lbWNweSgmdG8sICZmcm9tLCBz aXplb2YodG8pKTsKKyAgICByZXR1cm4gdG87Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlu bGluZSBjb25zdGV4cHIgVCBtYXNrKFQgdmFsdWUsIHVpbnRwdHJfdCBtYXNrKQogewotICAgIHJl dHVybiByZWludGVycHJldF9jYXN0PFQ+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih2YWx1 ZSkgJiBtYXNrKTsKKyAgICByZXR1cm4gYml0d2lzZV9jYXN0PFQ+KGJpdHdpc2VfY2FzdDx1aW50 cHRyX3Q+KHZhbHVlKSAmIG1hc2spOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUg Y29uc3RleHByIGJvb2wgdGVzdChUIHZhbHVlLCB1aW50cHRyX3QgbWFzaykKQEAgLTY2LDcgKzc5 LDcgQEAgaW5saW5lIGNvbnN0ZXhwciBib29sIGlzUG93ZXJPZlR3byhzaXplXwogdGVtcGxhdGU8 dHlwZW5hbWUgVD4gaW5saW5lIFQgcm91bmRVcFRvTXVsdGlwbGVPZihzaXplX3QgZGl2aXNvciwg VCB4KQogewogICAgIEJBU1NFUlQoaXNQb3dlck9mVHdvKGRpdmlzb3IpKTsKLSAgICByZXR1cm4g cmVpbnRlcnByZXRfY2FzdDxUPigocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRp dmlzb3IgLSAxKSkgJiB+KGRpdmlzb3IgLSAxKSk7CisgICAgcmV0dXJuIGJpdHdpc2VfY2FzdDxU PigoYml0d2lzZV9jYXN0PHVpbnRwdHJfdD4oeCkgKyAoZGl2aXNvciAtIDEpKSAmIH4oZGl2aXNv ciAtIDEpKTsKIH0KIAogdGVtcGxhdGU8c2l6ZV90IGRpdmlzb3IsIHR5cGVuYW1lIFQ+IGlubGlu ZSBjb25zdGV4cHIgVCByb3VuZFVwVG9NdWx0aXBsZU9mKFQgeCkK 313610 2017-06-22 05:44:20 -0700 2017-07-05 15:58:01 -0700 patch bug173622.diff text/plain 2459 daewoong.jang SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxODY5MSkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA2LTIyICBEYWV3b29u ZyBKYW5nICA8ZGFld29vbmcuamFuZ0BuYXZlcmNvcnAuY29tPgorCisgICAgICAgIHJlaW50ZXJw cmV0X2Nhc3QgZG9lcyBub3QgZXZhbHVhdGUgdG8gY29uc3RhbnQgZXhwcmVzc2lvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBibWFsbG9jL0FsZ29y aXRobS5oOgorICAgICAgICAoYm1hbGxvYzo6bWFzayk6CisgICAgICAgIChibWFsbG9jOjpyb3Vu ZFVwVG9NdWx0aXBsZU9mKToKKwogMjAxNy0wNi0xMCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmVydGVkIHIyMTgwNTYgYmVjYXVzZSBpdCBtYWRlIHRoZSBJ REUgcmVpbmRleCBjb25zdGFudGx5LgpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdv cml0aG0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5o CShyZXZpc2lvbiAyMTg2NTcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5o CSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCwxMiBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBp bmxpbmUgY29uc3RleHByIFQKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIGNvbnN0ZXhw ciBUIG1hc2soVCB2YWx1ZSwgdWludHB0cl90IG1hc2spCiB7Ci0gICAgcmV0dXJuIHJlaW50ZXJw cmV0X2Nhc3Q8VD4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHZhbHVlKSAmIG1hc2spOwor ICAgIHJldHVybiBzdGF0aWNfY2FzdDxUPihzdGF0aWNfY2FzdDx1aW50cHRyX3Q+KHZhbHVlKSAm IG1hc2spOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgVCogbWFzayhUKiB2YWx1 ZSwgdWludHB0cl90IG1hc2spCit7CisgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VCo+KHJl aW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih2YWx1ZSkgJiBtYXNrKTsKIH0KIAogdGVtcGxhdGU8 dHlwZW5hbWUgVD4gaW5saW5lIGNvbnN0ZXhwciBib29sIHRlc3QoVCB2YWx1ZSwgdWludHB0cl90 IG1hc2spCkBAIC02NiwxMyArNzEsMjUgQEAgaW5saW5lIGNvbnN0ZXhwciBib29sIGlzUG93ZXJP ZlR3byhzaXplXwogdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQgcm91bmRVcFRvTXVsdGlw bGVPZihzaXplX3QgZGl2aXNvciwgVCB4KQogewogICAgIEJBU1NFUlQoaXNQb3dlck9mVHdvKGRp dmlzb3IpKTsKLSAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUPigocmVpbnRlcnByZXRfY2Fz dDx1aW50cHRyX3Q+KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRpdmlzb3IgLSAxKSk7CisgICAg cmV0dXJuIHN0YXRpY19jYXN0PFQ+KChzdGF0aWNfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRpdmlz b3IgLSAxKSkgJiB+KGRpdmlzb3IgLSAxKSk7CiB9CiAKIHRlbXBsYXRlPHNpemVfdCBkaXZpc29y LCB0eXBlbmFtZSBUPiBpbmxpbmUgY29uc3RleHByIFQgcm91bmRVcFRvTXVsdGlwbGVPZihUIHgp CiB7CiAgICAgc3RhdGljX2Fzc2VydChpc1Bvd2VyT2ZUd28oZGl2aXNvciksICInZGl2aXNvcicg bXVzdCBiZSBhIHBvd2VyIG9mIHR3by4iKTsKICAgICByZXR1cm4gcm91bmRVcFRvTXVsdGlwbGVP ZihkaXZpc29yLCB4KTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQqIHJvdW5k VXBUb011bHRpcGxlT2Yoc2l6ZV90IGRpdmlzb3IsIFQqIHgpCit7CisgICAgQkFTU0VSVChpc1Bv d2VyT2ZUd28oZGl2aXNvcikpOworICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFQqPigocmVp bnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRpdmlzb3Ig LSAxKSk7Cit9CisKK3RlbXBsYXRlPHNpemVfdCBkaXZpc29yLCB0eXBlbmFtZSBUPiBpbmxpbmUg VCogcm91bmRVcFRvTXVsdGlwbGVPZihUKiB4KQoreworICAgIHN0YXRpY19hc3NlcnQoaXNQb3dl ck9mVHdvKGRpdmlzb3IpLCAiJ2Rpdmlzb3InIG11c3QgYmUgYSBwb3dlciBvZiB0d28uIik7Cisg ICAgcmV0dXJuIHJvdW5kVXBUb011bHRpcGxlT2YoZGl2aXNvciwgeCk7CiB9CiAKIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IGlubGluZSBUIHJvdW5kRG93blRvTXVsdGlwbGVPZihzaXplX3QgZGl2aXNv ciwgVCB4KQo= 314660 2017-07-05 15:58:01 -0700 2017-07-05 19:30:43 -0700 patch bug173622.diff text/plain 2639 daewoong.jang SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxOTE2MikKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA3LTA1ICBEYWV3b29u ZyBKYW5nICA8ZGFld29vbmcuamFuZ0BuYXZlcmNvcnAuY29tPgorCisgICAgICAgIHJlaW50ZXJw cmV0X2Nhc3QgZG9lcyBub3QgZXZhbHVhdGUgdG8gY29uc3RleHByCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM2MjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJtYWxsb2MvQWxnb3JpdGhtLmg6Cisg ICAgICAgIChibWFsbG9jOjptYXNrKToKKyAgICAgICAgKGJtYWxsb2M6OnJvdW5kVXBUb011bHRp cGxlT2YpOgorCiAyMDE3LTA3LTAzICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBbWGNvZGVdIEFkZCBhbiBleHBlcmltZW50YWwgc2V0dGluZyB0byBidWlsZCB3aXRo IGNjYWNoZQpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCShyZXZpc2lvbiAyMTkx NjIpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCSh3b3JraW5nIGNvcHkp CkBAIC01MCw3ICs1MCwxMyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgY29uc3RleHBy IFQKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIGNvbnN0ZXhwciBUIG1hc2soVCB2YWx1 ZSwgdWludHB0cl90IG1hc2spCiB7Ci0gICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VD4ocmVp bnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHZhbHVlKSAmIG1hc2spOworICAgIHN0YXRpY19hc3Nl cnQoc2l6ZW9mKFQpID09IHNpemVvZih1aW50cHRyX3QpLCAic2l6ZW9mKFQpIG11c3QgYmUgZXF1 YWwgdG8gc2l6ZW9mKHVpbnRwdHJfdCkuIik7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFQ+KHN0 YXRpY19jYXN0PHVpbnRwdHJfdD4odmFsdWUpICYgbWFzayk7Cit9CisKK3RlbXBsYXRlPHR5cGVu YW1lIFQ+IGlubGluZSBUKiBtYXNrKFQqIHZhbHVlLCB1aW50cHRyX3QgbWFzaykKK3sKKyAgICBy ZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUKj4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHZh bHVlKSAmIG1hc2spOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgY29uc3RleHBy IGJvb2wgdGVzdChUIHZhbHVlLCB1aW50cHRyX3QgbWFzaykKQEAgLTY2LDEwICs3MiwyMyBAQCBp bmxpbmUgY29uc3RleHByIGJvb2wgaXNQb3dlck9mVHdvKHNpemVfCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiBpbmxpbmUgVCByb3VuZFVwVG9NdWx0aXBsZU9mKHNpemVfdCBkaXZpc29yLCBUIHgpCiB7 CiAgICAgQkFTU0VSVChpc1Bvd2VyT2ZUd28oZGl2aXNvcikpOwotICAgIHJldHVybiByZWludGVy cHJldF9jYXN0PFQ+KChyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oeCkgKyAoZGl2aXNvciAt IDEpKSAmIH4oZGl2aXNvciAtIDEpKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihUKSA9PSBz aXplb2YodWludHB0cl90KSwgInNpemVvZihUKSBtdXN0IGJlIGVxdWFsIHRvIHNpemVvZih1aW50 cHRyX3QpLiIpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxUPigoc3RhdGljX2Nhc3Q8dWludHB0 cl90Pih4KSArIChkaXZpc29yIC0gMSkpICYgfihkaXZpc29yIC0gMSkpOworfQorCit0ZW1wbGF0 ZTxzaXplX3QgZGl2aXNvciwgdHlwZW5hbWUgVD4gaW5saW5lIFQgcm91bmRVcFRvTXVsdGlwbGVP ZihUIHgpCit7CisgICAgc3RhdGljX2Fzc2VydChpc1Bvd2VyT2ZUd28oZGl2aXNvciksICInZGl2 aXNvcicgbXVzdCBiZSBhIHBvd2VyIG9mIHR3by4iKTsKKyAgICByZXR1cm4gcm91bmRVcFRvTXVs dGlwbGVPZihkaXZpc29yLCB4KTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQq IHJvdW5kVXBUb011bHRpcGxlT2Yoc2l6ZV90IGRpdmlzb3IsIFQqIHgpCit7CisgICAgQkFTU0VS VChpc1Bvd2VyT2ZUd28oZGl2aXNvcikpOworICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFQq PigocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHgpICsgKGRpdmlzb3IgLSAxKSkgJiB+KGRp dmlzb3IgLSAxKSk7CiB9CiAKLXRlbXBsYXRlPHNpemVfdCBkaXZpc29yLCB0eXBlbmFtZSBUPiBp bmxpbmUgY29uc3RleHByIFQgcm91bmRVcFRvTXVsdGlwbGVPZihUIHgpCit0ZW1wbGF0ZTxzaXpl X3QgZGl2aXNvciwgdHlwZW5hbWUgVD4gaW5saW5lIFQqIHJvdW5kVXBUb011bHRpcGxlT2YoVCog eCkKIHsKICAgICBzdGF0aWNfYXNzZXJ0KGlzUG93ZXJPZlR3byhkaXZpc29yKSwgIidkaXZpc29y JyBtdXN0IGJlIGEgcG93ZXIgb2YgdHdvLiIpOwogICAgIHJldHVybiByb3VuZFVwVG9NdWx0aXBs ZU9mKGRpdmlzb3IsIHgpOwo=