29187 2009-09-11 09:11:18 -0700 Don't inline ~ListRefPtr() to workaround winscw compiler forward declaration limitation. 2009-10-01 12:18:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) S60 Emulator S60 3rd edition RESOLVED FIXED P2 Normal --- 27065 29738 1 yongjun.zhang webkit-unassigned commit-queue darin koshuin oldest_to_newest 146592 0 yongjun.zhang 2009-09-11 09:11:18 -0700 ListRefPtr is used in FontFamily to embed SharedFontFamily as it's member. Winscw compiler complains that SharedFontFamily is not defined. 146640 1 39449 yongjun.zhang 2009-09-11 10:48:29 -0700 Created attachment 39449 Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other compilers. 146715 2 koshuin 2009-09-11 12:49:55 -0700 (In reply to comment #1) > Created an attachment (id=39449) [details] > Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other > compilers. This can be solved by not inlining the corresponding constructor and assignement operator from refptr.h ? 146728 3 yongjun.zhang 2009-09-11 13:31:42 -0700 (In reply to comment #2) > (In reply to comment #1) > > Created an attachment (id=39449) [details] [details] > > Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other > > compilers. > This can be solved by not inlining the corresponding constructor and > assignement operator from refptr.h ? No, this is for ListRefPtr which is a different templated class than RefPtr. 146805 4 39449 eric 2009-09-11 16:49:16 -0700 Comment on attachment 39449 Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other compilers. Can you help us understand this limitation more? Have you filed a bug with the winscw folks? Do they have a public bug tracker? 146891 5 yongjun.zhang 2009-09-11 21:21:25 -0700 (In reply to comment #4) > (From update of attachment 39449 [details]) > Can you help us understand this limitation more? Have you filed a bug with the > winscw folks? Do they have a public bug tracker? Sorry I didn't explain it in detail in error description. ~ListRefPtr() has the following line: RefPtr<T> reaper = this->release(); which calls the ctr RefPtr<T>::RefPtr(T*), where ref() is called. Winscw compiler tries to resolve T::ref() when ~ListRefPtr() is inlined, and it fails if class T is not defined before that. I filed a bug to winscw team: https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812 for similar issue in https://bugs.webkit.org/show_bug.cgi?id=28054. Janne, you are right. If we don't inline the ctor and assignment operator in RefPtr.h, this problem could be resolved. There is another patch trying to address the same issue for KeyframeList and AnimationBase (https://bugs.webkit.org/show_bug.cgi?id=29204). And it could be also resolved by removing inline for PassRefPtr's ctor and assignment operator. Therefore, if we change PassRefPtr & RefPtr's ctor and assignement operator, we can avoid making changes in other places. Eric, do you think it is a better approach? 147481 6 39449 eric 2009-09-15 23:02:20 -0700 Comment on attachment 39449 Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other compilers. Maybe I don't understand C++ well enough, but I don't understand how you can have non-inline template code in a header. I don't see what the "inline" keyword would do here, the destructor will always be inlined, no? Also, this needs a comment in the code and a link to the winscw bug. What is being forward declared here that winscw can't understand? 147536 7 darin 2009-09-16 08:26:08 -0700 (In reply to comment #6) > (From update of attachment 39449 [details]) > Maybe I don't understand C++ well enough, but I don't understand how you can > have non-inline template code in a header. You're right to doubt your C++ knowledge here, Eric. Template code goes in headers; whether it's marked inline or not is not important. It's not correct to have a non-template function in a header unless it's marked inline, but that does not apply to function templates. 147569 8 yongjun.zhang 2009-09-16 11:39:19 -0700 (In reply to comment #6) Thanks a lot, Eric. > Also, this needs a comment in the code and a link to the winscw bug. > What is being forward declared here that winscw can't understand? 147572 9 yongjun.zhang 2009-09-16 11:58:18 -0700 (In reply to comment #6) Thanks a lot, Eric. > Also, this needs a comment in the code and a link to the winscw bug. I will modify the patch as suggested. > What is being forward declared here that winscw can't understand? Class FontFamily (in WebCore/platform/graphics) has member " ListRefPtr<SharedFontFamily> m_next". SharedFontFamily is forward declared but winscw compiler complains it is not enough to resolve SharedFontFamily::ref(), when ~ListRefPtr is inlined in the implicit default dtor of FontFamily (which is inlined too). To summerize how this happens: 1. ~FontFamily() is inlined, the compiler tries to resolve ~ListRefPtr() from inside. 2. ~ListRefPtr() has line "RefPtr<T> reaper = this->release();", which calls the ctr RefPtr<T>::RefPtr(T*), where ref() is called. Winscw compiler tries to resolve T::ref() when ~ListRefPtr() is inlined, and it fails if class T is not defined before that. 150513 10 40235 yongjun.zhang 2009-09-28 08:18:26 -0700 Created attachment 40235 modify patch to include Eric's comments. add link to winscw compiler bug in ChangeLog, to remind us revert this change when the bug is fixed. 150527 11 40242 yongjun.zhang 2009-09-28 09:26:01 -0700 Created attachment 40242 modify patch to include Eric's comments. document the winscw compiler bug in ChangeLog and the changed source code. 151651 12 40242 commit-queue 2009-10-01 12:18:11 -0700 Comment on attachment 40242 modify patch to include Eric's comments. Clearing flags on attachment: 40242 Committed r48988: <http://trac.webkit.org/changeset/48988> 151652 13 commit-queue 2009-10-01 12:18:16 -0700 All reviewed patches have been landed. Closing bug. 39449 2009-09-11 10:48:29 -0700 2009-09-28 08:18:26 -0700 Don't inline ~ListRefPtr for winscw compiler, keep it inlined for other compilers. ListRefPtr.patch text/plain 2156 yongjun.zhang SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4MzA1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDktMTEgIFlvbmdqdW4g WmhhbmcgIDx5b25nanVuLnpoYW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjkxODcKKyAgICAgICAgCisgICAgICAgIERvbid0IGlubGluZSB+TGlzdFJlZlB0 cigpIHRvIHdvcmthcm91bmQgd2luc2N3IGNvbXBpbGVyIGZvcndhcmQgZGVjbGFyYXRpb24gCisg ICAgICAgIGxpbWl0YXRpb24uCisKKyAgICAgICAgKiB3dGYvTGlzdFJlZlB0ci5oOgorICAgICAg ICAoV1RGOjo6On5MaXN0UmVmUHRyKToKKwogMjAwOS0wOS0xMSAgSm9jZWx5biBUdXJjb3R0ZSAg PGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEhhdXNtYW5uLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RSZWZQdHIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvTGlzdFJlZlB0ci5oCShyZXZpc2lvbiA0ODMwMCkK KysrIEphdmFTY3JpcHRDb3JlL3d0Zi9MaXN0UmVmUHRyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0 LDEzICszNCw4IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBMaXN0UmVmUHRyKGNvbnN0IFJl ZlB0cjxUPiYgbykgOiBSZWZQdHI8VD4obykge30KICAgICAgICAgLy8gc2VlIGNvbW1lbnQgaW4g UGFzc1JlZlB0ci5oIGZvciB3aHkgdGhpcyB0YWtlcyBjb25zdCByZWZlcmVuY2UKICAgICAgICAg dGVtcGxhdGUgPHR5cGVuYW1lIFU+IExpc3RSZWZQdHIoY29uc3QgUGFzc1JlZlB0cjxVPiYgbykg OiBSZWZQdHI8VD4obykge30KLQotICAgICAgICB+TGlzdFJlZlB0cigpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIFJlZlB0cjxUPiByZWFwZXIgPSB0aGlzLT5yZWxlYXNlKCk7Ci0gICAgICAgICAg ICB3aGlsZSAocmVhcGVyICYmIHJlYXBlci0+aGFzT25lUmVmKCkpCi0gICAgICAgICAgICAgICAg cmVhcGVyID0gcmVhcGVyLT5yZWxlYXNlTmV4dCgpOyAvLyBpbXBsaWNpdGx5IHByb3RlY3RzIHJl YXBlci0+bmV4dCwgdGhlbiBkZXJlZnMgcmVhcGVyCi0gICAgICAgIH0KKyAgICAgICAgCisgICAg ICAgIH5MaXN0UmVmUHRyKCk7CiAgICAgICAgIAogICAgICAgICBMaXN0UmVmUHRyJiBvcGVyYXRv cj0oVCogb3B0cikgeyBSZWZQdHI8VD46Om9wZXJhdG9yPShvcHRyKTsgcmV0dXJuICp0aGlzOyB9 CiAgICAgICAgIExpc3RSZWZQdHImIG9wZXJhdG9yPShjb25zdCBSZWZQdHI8VD4mIG8pIHsgUmVm UHRyPFQ+OjpvcGVyYXRvcj0obyk7IHJldHVybiAqdGhpczsgfQpAQCAtNDksNiArNDQsMTcgQEAg bmFtZXNwYWNlIFdURiB7CiAgICAgICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBMaXN0UmVmUHRy JiBvcGVyYXRvcj0oY29uc3QgUGFzc1JlZlB0cjxVPiYgbykgeyBSZWZQdHI8VD46Om9wZXJhdG9y PShvKTsgcmV0dXJuICp0aGlzOyB9CiAgICAgfTsKIAorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBU PiAKKyNpZiAhQ09NUElMRVIoV0lOU0NXKQorICAgIGlubGluZQorI2VuZGlmCisgICAgTGlzdFJl ZlB0cjxUPjo6fkxpc3RSZWZQdHIoKQorICAgIHsKKyAgICAgICAgUmVmUHRyPFQ+IHJlYXBlciA9 IHRoaXMtPnJlbGVhc2UoKTsKKyAgICAgICAgd2hpbGUgKHJlYXBlciAmJiByZWFwZXItPmhhc09u ZVJlZigpKQorICAgICAgICAgICAgcmVhcGVyID0gcmVhcGVyLT5yZWxlYXNlTmV4dCgpOyAvLyBp bXBsaWNpdGx5IHByb3RlY3RzIHJlYXBlci0+bmV4dCwgdGhlbiBkZXJlZnMgcmVhcGVyCisgICAg fQorCiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSBUKiBnZXRQdHIoY29uc3QgTGlz dFJlZlB0cjxUPiYgcCkKICAgICB7CiAgICAgICAgIHJldHVybiBwLmdldCgpOwo= 40235 2009-09-28 08:18:26 -0700 2009-09-28 09:26:01 -0700 modify patch to include Eric's comments. ListRefPtr.patch text/plain 2369 yongjun.zhang SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgKHJldmlzaW9uIDQ4ODEzKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nICh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMDktMjggIFlvbmdqdW4g WmhhbmcgIDx5b25nanVuLnpoYW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjkxODcKKworICAgICAgICBEb24ndCBpbmxpbmUgfkxpc3RSZWZQdHIoKSB0byB3 b3JrIGFyb3VuZCB3aW5zY3cgY29tcGlsZXIgZm9yd2FyZCBkZWNsYXJhdGlvbgorICAgICAgICBi dWcgcmVnYXJkaW5nIHRlbXBsYXRlZCBjbGFzc2VzLgorCisgICAgICAgIFRoZSBjb21waWxlciBi dWcgaXMgcmVwb3J0ZWQgYXQ6CisgICAgICAgIGh0dHBzOi8veGRhYnVnMDAxLmV4dC5ub2tpYS5j b20vYnVnemlsbGEvc2hvd19idWcuY2dpP2lkPTk4MTIKKworICAgICAgICBUaGUgY2hhbmdlIHdp bGwgYmUgcmV2ZXJ0ZWQgd2hlbiB0aGUgYWJvdmUgYnVnIGlzIGZpeGVkIGluIHdpbnNjdyBjb21w aWxlci4KKworICAgICAgICAqIHd0Zi9MaXN0UmVmUHRyLmg6CisgICAgICAgIChXVEY6Ojo6fkxp c3RSZWZQdHIpOgorCiAyMDA5LTA5LTI4ICBKb2VyZyBCb3JuZW1hbm4gIDxqb2VyZy5ib3JuZW1h bm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpJbmRl eDogSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RSZWZQdHIuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2Ny aXB0Q29yZS93dGYvTGlzdFJlZlB0ci5oIChyZXZpc2lvbiA0ODgxMCkKKysrIEphdmFTY3JpcHRD b3JlL3d0Zi9MaXN0UmVmUHRyLmggKHdvcmtpbmcgY29weSkKQEAgLTM0LDEzICszNCw4IEBAIG5h bWVzcGFjZSBXVEYgewogICAgICAgICBMaXN0UmVmUHRyKGNvbnN0IFJlZlB0cjxUPiYgbykgOiBS ZWZQdHI8VD4obykge30KICAgICAgICAgLy8gc2VlIGNvbW1lbnQgaW4gUGFzc1JlZlB0ci5oIGZv ciB3aHkgdGhpcyB0YWtlcyBjb25zdCByZWZlcmVuY2UKICAgICAgICAgdGVtcGxhdGUgPHR5cGVu YW1lIFU+IExpc3RSZWZQdHIoY29uc3QgUGFzc1JlZlB0cjxVPiYgbykgOiBSZWZQdHI8VD4obykg e30KLQotICAgICAgICB+TGlzdFJlZlB0cigpCi0gICAgICAgIHsKLSAgICAgICAgICAgIFJlZlB0 cjxUPiByZWFwZXIgPSB0aGlzLT5yZWxlYXNlKCk7Ci0gICAgICAgICAgICB3aGlsZSAocmVhcGVy ICYmIHJlYXBlci0+aGFzT25lUmVmKCkpCi0gICAgICAgICAgICAgICAgcmVhcGVyID0gcmVhcGVy LT5yZWxlYXNlTmV4dCgpOyAvLyBpbXBsaWNpdGx5IHByb3RlY3RzIHJlYXBlci0+bmV4dCwgdGhl biBkZXJlZnMgcmVhcGVyCi0gICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIH5MaXN0UmVmUHRy KCk7CiAgICAgICAgIAogICAgICAgICBMaXN0UmVmUHRyJiBvcGVyYXRvcj0oVCogb3B0cikgeyBS ZWZQdHI8VD46Om9wZXJhdG9yPShvcHRyKTsgcmV0dXJuICp0aGlzOyB9CiAgICAgICAgIExpc3RS ZWZQdHImIG9wZXJhdG9yPShjb25zdCBSZWZQdHI8VD4mIG8pIHsgUmVmUHRyPFQ+OjpvcGVyYXRv cj0obyk7IHJldHVybiAqdGhpczsgfQpAQCAtNDksNiArNDQsMTcgQEAgbmFtZXNwYWNlIFdURiB7 CiAgICAgICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBMaXN0UmVmUHRyJiBvcGVyYXRvcj0oY29u c3QgUGFzc1JlZlB0cjxVPiYgbykgeyBSZWZQdHI8VD46Om9wZXJhdG9yPShvKTsgcmV0dXJuICp0 aGlzOyB9CiAgICAgfTsKIAorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiAKKyNpZiAhQ09NUElM RVIoV0lOU0NXKQorICAgIGlubGluZQorI2VuZGlmCisgICAgTGlzdFJlZlB0cjxUPjo6fkxpc3RS ZWZQdHIoKQorICAgIHsKKyAgICAgICAgUmVmUHRyPFQ+IHJlYXBlciA9IHRoaXMtPnJlbGVhc2Uo KTsKKyAgICAgICAgd2hpbGUgKHJlYXBlciAmJiByZWFwZXItPmhhc09uZVJlZigpKQorICAgICAg ICAgICAgcmVhcGVyID0gcmVhcGVyLT5yZWxlYXNlTmV4dCgpOyAvLyBpbXBsaWNpdGx5IHByb3Rl Y3RzIHJlYXBlci0+bmV4dCwgdGhlbiBkZXJlZnMgcmVhcGVyCisgICAgfQorCiAgICAgdGVtcGxh dGUgPHR5cGVuYW1lIFQ+IGlubGluZSBUKiBnZXRQdHIoY29uc3QgTGlzdFJlZlB0cjxUPiYgcCkK ICAgICB7CiAgICAgICAgIHJldHVybiBwLmdldCgpOwo= 40242 2009-09-28 09:26:01 -0700 2009-10-01 12:18:11 -0700 modify patch to include Eric's comments. ListRefPtr.patch text/plain 2599 yongjun.zhang SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cocmV2aXNpb24gNDg4MTYpCisrKyBKYXZhU2NyaXB0Q29yZS9DaGFuZ2VM b2cod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDA5LTA5LTI4ICBZb25nanVuIFpo YW5nICA8eW9uZ2p1bi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI5MTg3CisKKyAgICAgICAgRG9uJ3QgaW5saW5lIH5MaXN0UmVmUHRyKCkgdG8gd29y ayBhcm91bmQgd2luc2N3IGNvbXBpbGVyIGZvcndhcmQgZGVjbGFyYXRpb24KKyAgICAgICAgYnVn IHJlZ2FyZGluZyB0ZW1wbGF0ZWQgY2xhc3Nlcy4KKworICAgICAgICBUaGUgY29tcGlsZXIgYnVn IGlzIHJlcG9ydGVkIGF0OgorICAgICAgICBodHRwczovL3hkYWJ1ZzAwMS5leHQubm9raWEuY29t L2J1Z3ppbGxhL3Nob3dfYnVnLmNnaT9pZD05ODEyCisKKyAgICAgICAgVGhlIGNoYW5nZSB3aWxs IGJlIHJldmVydGVkIHdoZW4gdGhlIGFib3ZlIGJ1ZyBpcyBmaXhlZCBpbiB3aW5zY3cgY29tcGls ZXIuCisKKyAgICAgICAgKiB3dGYvTGlzdFJlZlB0ci5oOgorICAgICAgICAoV1RGOjo6On5MaXN0 UmVmUHRyKToKKwogMjAwOS0wOS0yOCAgSm9lcmcgQm9ybmVtYW5uICA8am9lcmcuYm9ybmVtYW5u QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6 IEphdmFTY3JpcHRDb3JlL3d0Zi9MaXN0UmVmUHRyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlw dENvcmUvd3RmL0xpc3RSZWZQdHIuaChyZXZpc2lvbiA0ODgxNikKKysrIEphdmFTY3JpcHRDb3Jl L3d0Zi9MaXN0UmVmUHRyLmgod29ya2luZyBjb3B5KQpAQCAtMzQsMTMgKzM0LDggQEAgbmFtZXNw YWNlIFdURiB7CiAgICAgICAgIExpc3RSZWZQdHIoY29uc3QgUmVmUHRyPFQ+JiBvKSA6IFJlZlB0 cjxUPihvKSB7fQogICAgICAgICAvLyBzZWUgY29tbWVudCBpbiBQYXNzUmVmUHRyLmggZm9yIHdo eSB0aGlzIHRha2VzIGNvbnN0IHJlZmVyZW5jZQogICAgICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg VT4gTGlzdFJlZlB0cihjb25zdCBQYXNzUmVmUHRyPFU+JiBvKSA6IFJlZlB0cjxUPihvKSB7fQot Ci0gICAgICAgIH5MaXN0UmVmUHRyKCkKLSAgICAgICAgewotICAgICAgICAgICAgUmVmUHRyPFQ+ IHJlYXBlciA9IHRoaXMtPnJlbGVhc2UoKTsKLSAgICAgICAgICAgIHdoaWxlIChyZWFwZXIgJiYg cmVhcGVyLT5oYXNPbmVSZWYoKSkKLSAgICAgICAgICAgICAgICByZWFwZXIgPSByZWFwZXItPnJl bGVhc2VOZXh0KCk7IC8vIGltcGxpY2l0bHkgcHJvdGVjdHMgcmVhcGVyLT5uZXh0LCB0aGVuIGRl cmVmcyByZWFwZXIKLSAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgfkxpc3RSZWZQdHIoKTsK ICAgICAgICAgCiAgICAgICAgIExpc3RSZWZQdHImIG9wZXJhdG9yPShUKiBvcHRyKSB7IFJlZlB0 cjxUPjo6b3BlcmF0b3I9KG9wdHIpOyByZXR1cm4gKnRoaXM7IH0KICAgICAgICAgTGlzdFJlZlB0 ciYgb3BlcmF0b3I9KGNvbnN0IFJlZlB0cjxUPiYgbykgeyBSZWZQdHI8VD46Om9wZXJhdG9yPShv KTsgcmV0dXJuICp0aGlzOyB9CkBAIC00OSw2ICs0NCwyMCBAQCBuYW1lc3BhY2UgV1RGIHsKICAg ICAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IExpc3RSZWZQdHImIG9wZXJhdG9yPShjb25zdCBQ YXNzUmVmUHRyPFU+JiBvKSB7IFJlZlB0cjxUPjo6b3BlcmF0b3I9KG8pOyByZXR1cm4gKnRoaXM7 IH0KICAgICB9OwogCisgICAgLy8gUmVtb3ZlIGlubGluZSBmb3Igd2luc2N3IGNvbXBpbGVyIHRv IHByZXZlbnQgdGhlIGNvbXBpbGVyIGFncmVzc2l2ZWx5IHJlc29sdmluZworICAgIC8vIFQ6OnJl ZigpIGluIFJlZlB0cjxUPidzIGNvcHkgY29uc3RydWN0b3IuICBUaGUgYnVnIGlzIHJlcG9ydGVk IGF0OgorICAgIC8vIGh0dHBzOi8veGRhYnVnMDAxLmV4dC5ub2tpYS5jb20vYnVnemlsbGEvc2hv d19idWcuY2dpP2lkPTk4MTIuCisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+IAorI2lmICFDT01Q SUxFUihXSU5TQ1cpCisgICAgaW5saW5lCisjZW5kaWYKKyAgICBMaXN0UmVmUHRyPFQ+Ojp+TGlz dFJlZlB0cigpCisgICAgeworICAgICAgICBSZWZQdHI8VD4gcmVhcGVyID0gdGhpcy0+cmVsZWFz ZSgpOworICAgICAgICB3aGlsZSAocmVhcGVyICYmIHJlYXBlci0+aGFzT25lUmVmKCkpCisgICAg ICAgICAgICByZWFwZXIgPSByZWFwZXItPnJlbGVhc2VOZXh0KCk7IC8vIGltcGxpY2l0bHkgcHJv dGVjdHMgcmVhcGVyLT5uZXh0LCB0aGVuIGRlcmVmcyByZWFwZXIKKyAgICB9CisKICAgICB0ZW1w bGF0ZSA8dHlwZW5hbWUgVD4gaW5saW5lIFQqIGdldFB0cihjb25zdCBMaXN0UmVmUHRyPFQ+JiBw KQogICAgIHsKICAgICAgICAgcmV0dXJuIHAuZ2V0KCk7Cg==