185893 2018-05-22 16:43:08 -0700 Logging macros are sensitive to pal/Logging.h vs Logging.h include order 2018-06-06 11:21:24 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue don.olmstead mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1426393 0 simon.fraser 2018-05-22 16:43:08 -0700 Add a #include <pal/Logging.h> to a .cpp file can break the build, because subsequent files in the same UnifiedSources*.cpp may use the LOG macro, and pal/Logging.h and Logging.h #define LOG_CHANNEL_PREFIX to different things. I don't think pal/Logging.h should define any log channels, nor define LOG_CHANNEL_PREFIX. 1426399 1 simon.fraser 2018-05-22 16:50:42 -0700 Errors look like: Undefined symbols for architecture x86_64: "WebCore::PALLogIndexedDB", referenced from: WebCore::injectIDBKeyIntoScriptValue(JSC::ExecState&, WebCore::IDBKeyData const&, JSC::JSValue, WTF::Variant<WTF::String, WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul> > const&) in UnifiedSource170.o "WebCore::PALLogStorageAPI", referenced from: WebCore::canInjectIDBKeyIntoScriptValue(JSC::ExecState&, JSC::JSValue const&, WTF::Variant<WTF::String, WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow, 16ul> > const&) in UnifiedSource170.o ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) 1426424 2 simon.fraser 2018-05-22 17:26:44 -0700 I think we can just gut pal/Logging.h 1426655 3 don.olmstead 2018-05-23 11:27:41 -0700 Might we want to move commonality up to WTF then specialize based on WebCore/PAL etc? 1426658 4 simon.fraser 2018-05-23 11:44:13 -0700 Yes, we should. 1429978 5 341941 simon.fraser 2018-06-04 17:55:51 -0700 Created attachment 341941 Patch 1430526 6 341941 commit-queue 2018-06-06 11:20:37 -0700 Comment on attachment 341941 Patch Clearing flags on attachment: 341941 Committed r232550: <https://trac.webkit.org/changeset/232550> 1430527 7 commit-queue 2018-06-06 11:20:38 -0700 All reviewed patches have been landed. Closing bug. 1430528 8 webkit-bug-importer 2018-06-06 11:21:24 -0700 <rdar://problem/40859215> 341941 2018-06-04 17:55:51 -0700 2018-06-06 11:20:37 -0700 Patch bug-185893-20180604175551.patch text/plain 12972 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBiYWI0YmMx ZjUxYTg2YzQyMTQ2MDRhNzc2ZmQ2YjJlNjEyOGI3ZmQ1Li4zNGZlNmM5YTQyOGFkMGRhZDM1ODMx ZDkyZmM3YjJkNzI1ZjllZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAor MjAxOC0wNi0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAg ICAgICBMb2dnaW5nIG1hY3JvcyBhcmUgc2Vuc2l0aXZlIHRvIHBhbC9Mb2dnaW5nLmggdnMgTG9n Z2luZy5oIGluY2x1ZGUgb3JkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NTg5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICAKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBmdW5jdGlvbmFsaXR5IGZyb20gcGFs L0xvZ2dpbmcgY29kZSB1bnRpbCB3ZSBuZWVkIGl0LiBQcmltYXJpbHkgdGhpcyByZW1vdmVzIHRo ZQorICAgICAgICAjZGVmaW5lIExPR19DSEFOTkVMX1BSRUZJWCBmcm9tIHBhbC9Mb2dnaW5nLmgs IHdoaWNoIGNhdXNlZCBpbmNsdWRlLW9yZGVyIHByb2JsZW1zIHdpdGggdW5pZmllZCBzb3VyY2Vz LgorICAgICAgICAKKyAgICAgICAgRnV0dXJlIHdvcmsgc2hvdWxkIG1vdmUgc2hhcmVkIGxvZ2dp bmcgY29kZSB1cCB0byBXVEYgKG9yIGludG8gUEFMKS4KKworICAgICAgICAqIFBBTC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHBhbC9DTWFrZUxpc3RzLnR4dDoKKyAgICAg ICAgKiBwYWwvTG9nSW5pdGlhbGl6YXRpb24uaDogUmVtb3ZlZC4KKyAgICAgICAgKiBwYWwvTG9n Z2luZy5jcHA6CisgICAgICAgIChQQUw6OmlzTG9nQ2hhbm5lbEVuYWJsZWQpOiBEZWxldGVkLgor ICAgICAgICAoUEFMOjpzZXRMb2dDaGFubmVsVG9BY2N1bXVsYXRlKTogRGVsZXRlZC4KKyAgICAg ICAgKFBBTDo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkpOiBEZWxldGVkLgorICAg ICAgICAqIHBhbC9Mb2dnaW5nLmg6CisgICAgICAgICogcGFsL2NvY29hL0xvZ2dpbmdDb2NvYS5t bTogUmVtb3ZlZC4KKwogMjAxOC0wNi0wNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbV2ViS2l0IG9uIHdhdGNoT1NdIFJlbW92ZSBhbGwgdXNlcyBv ZiB0aGUgRVhUUkFfWk9PTV9NT0RFIGNvbXBpbGVyIGZsYWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9QQUwueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3Jl L1BBTC9QQUwueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4MTA5YmY1YWNlM2I4MzFl ZjE5MWY0ZDNkZDI3ZjZjNTU5NmE0ODU5Li5lNDNlMWI4OWU2MzBhMjEyYWI4NjNmMjMxY2ZhYjk3 ZjA5YTg0Yjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvUEFMLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML1BBTC54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCkBAIC0xMDUsNyArMTA1LDYgQEAKIAkJMUMwOUQwNTgxRTMxQzU3RTAwNzI1 RjE4IC8qIGNvbmZpZy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUMwOUQwNTcxRTMxQzU3RTAwNzI1RjE4IC8qIGNvbmZpZy5oICovOyB9OwogCQkxQzQ4 NzZEODFGOEQ3RjRFMDBDQ0VFQkQgLyogTG9nZ2luZy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzQ4NzZENjFGOEQ3RjRFMDBDQ0VFQkQgLyogTG9n Z2luZy5jcHAgKi87IH07CiAJCTFDNDg3NkQ5MUY4RDdGNEUwMENDRUVCRCAvKiBMb2dnaW5nLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzQ4NzZENzFG OEQ3RjRFMDBDQ0VFQkQgLyogTG9nZ2luZy5oICovOyB9OwotCQkxQzQ4NzZFMDFGOEQ4Mzc1MDBD Q0VFQkQgLyogTG9nZ2luZ0NvY29hLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMUM0ODc2REYxRjhEODM3NTAwQ0NFRUJEIC8qIExvZ2dpbmdDb2NvYS5t bSAqLzsgfTsKIAkJMkQwMkU5M0MyMDU2RkFBNzAwQTEzNzk3IC8qIEF1ZGlvVG9vbGJveFNQSS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkQwMkU5M0Iy MDU2RkFBNzAwQTEzNzk3IC8qIEF1ZGlvVG9vbGJveFNQSS5oICovOyB9OwogCQkzMTMwOEIxNDIw QTIxNzA1MDAzRkI5MjkgLyogU3lzdGVtUHJldmlld1NQSS5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzEzMDhCMTMyMEEyMTcwNTAwM0ZCOTI5IC8qIFN5 c3RlbVByZXZpZXdTUEkuaCAqLzsgfTsKIAkJNTcwQUI4RjEyMEFFMkU4RDAwQjhCRTg3IC8qIFNl Y0tleVByb3h5U1BJLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA1NzBBQjhGMDIwQUUyRThEMDBCOEJFODcgLyogU2VjS2V5UHJveHlTUEkuaCAqLzsgfTsK QEAgLTI1MSw4ICsyNTAsNiBAQAogCQkxQzQ4NzZENjFGOEQ3RjRFMDBDQ0VFQkQgLyogTG9nZ2lu Zy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMb2dnaW5nLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJMUM0ODc2RDcxRjhEN0Y0RTAwQ0NFRUJEIC8qIExvZ2dpbmcuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gTG9nZ2luZy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzQ4NzZE QzFGOEQ3RkM2MDBDQ0VFQkQgLyogTG9nTWFjcm9zLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExvZ01hY3Jv cy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkxQzQ4NzZERDFGOEQ4MTJCMDBDQ0VF QkQgLyogTG9nSW5pdGlhbGl6YXRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTG9nSW5pdGlhbGl6YXRp b24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJMUM0ODc2REYxRjhEODM3NTAwQ0NF RUJEIC8qIExvZ2dpbmdDb2NvYS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IExvZ2dpbmdDb2Nv YS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM2N0NFQTExRTMyRURBODAwRjgw RjJFIC8qIEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsg cGF0aCA9IEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxQzY3Q0VBMjFFMzJFRTI2MDBGODBGMkUgLyogVmVyc2lvbi54Y2NvbmZpZyAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBWZXJzaW9uLnhjY29uZmlnOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkyRDAyRTkzQjIwNTZGQUE3MDBBMTM3OTcgLyogQXVkaW9Ub29sYm94 U1BJLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEF1ZGlvVG9vbGJveFNQSS5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTAwLDcgKzQ5Nyw2IEBACiAJCQkJQTM5 REU3NEQxRjdDNDQzQzAwN0JDQjAwIC8qIEh5c3RlcmVzaXNBY3Rpdml0eS5oICovLAogCQkJCTFD NDg3NkQ2MUY4RDdGNEUwMENDRUVCRCAvKiBMb2dnaW5nLmNwcCAqLywKIAkJCQkxQzQ4NzZENzFG OEQ3RjRFMDBDQ0VFQkQgLyogTG9nZ2luZy5oICovLAotCQkJCTFDNDg3NkREMUY4RDgxMkIwMEND RUVCRCAvKiBMb2dJbml0aWFsaXphdGlvbi5oICovLAogCQkJCTFDNDg3NkRDMUY4RDdGQzYwMEND RUVCRCAvKiBMb2dNYWNyb3MuaCAqLywKIAkJCQlBM0M2NkNEQTFGNDYyRDZBMDA5RTZFRTkgLyog U2Vzc2lvbklELmNwcCAqLywKIAkJCQlBM0M2NkNEQjFGNDYyRDZBMDA5RTZFRTkgLyogU2Vzc2lv bklELmggKi8sCkBAIC01NDIsNyArNTM4LDYgQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hp bGRyZW4gPSAoCiAJCQkJRjQ0MjkxNjYxRkE1MjcwNTAwMkNDOTNFIC8qIEZpbGVTaXplRm9ybWF0 dGVyQ29jb2EubW0gKi8sCi0JCQkJMUM0ODc2REYxRjhEODM3NTAwQ0NFRUJEIC8qIExvZ2dpbmdD b2NvYS5tbSAqLywKIAkJCSk7CiAJCQlwYXRoID0gY29jb2E7CiAJCQlzb3VyY2VUcmVlID0gIjxn cm91cD4iOwpAQCAtODIxLDcgKzgxNiw2IEBACiAJCQkJQTMwRDQxMjIxRjBERDBFQTAwQjcxOTU0 IC8qIEtpbGxSaW5nLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUEzMEQ0MTI1MUYwREQxMkQwMEI3 MTk1NCAvKiBLaWxsUmluZ01hYy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFDNDg3NkQ4MUY4RDdG NEUwMENDRUVCRCAvKiBMb2dnaW5nLmNwcCBpbiBTb3VyY2VzICovLAotCQkJCTFDNDg3NkUwMUY4 RDgzNzUwMENDRUVCRCAvKiBMb2dnaW5nQ29jb2EubW0gaW4gU291cmNlcyAqLywKIAkJCQkwQ0Y5 OUNBNDFGNzM2Mzc1MDA3RUU3OTMgLyogTWVkaWFUaW1lQVZGb3VuZGF0aW9uLmNwcCBpbiBTb3Vy Y2VzICovLAogCQkJCUExMTc1QjRGMUY2QjMzNzMwMEM0QjlGMCAvKiBQb3B1cE1lbnUubW0gaW4g U291cmNlcyAqLywKIAkJCQlBM0M2NkNEQzFGNDYyRDZBMDA5RTZFRTkgLyogU2Vzc2lvbklELmNw cCBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9DTWFr ZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvQ01ha2VMaXN0cy50eHQKaW5kZXgg YWViZTQ4MTE4NDA3MWYzOTFjMWJkNWIwNDhmMmVlYzBiOGQxYmQwNi4uMmY2ZThmMjA3MDM1OTc3 MGE4YmM2ZTNjYTRhZjgwZTc4OTE1NWNmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL0NNYWtlTGlz dHMudHh0CkBAIC0yLDcgKzIsNiBAQCBzZXQoUEFMX1BVQkxJQ19IRUFERVJTCiAgICAgRXhwb3J0 TWFjcm9zLmgKICAgICBGaWxlU2l6ZUZvcm1hdHRlci5oCiAgICAgSHlzdGVyZXNpc0FjdGl2aXR5 LmgKLSAgICBMb2dJbml0aWFsaXphdGlvbi5oCiAgICAgTG9nTWFjcm9zLmgKICAgICBMb2dnaW5n LmgKICAgICBTZXNzaW9uSUQuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9M b2dJbml0aWFsaXphdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9Mb2dJbml0aWFsaXph dGlvbi5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA1N2ZkZDY4ZTYxM2JjZTIwOTJl ZGU3OTEzYWJkODIwMWNjMGQzODVmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvTG9nSW5pdGlhbGl6YXRpb24uaAor KysgL2Rldi9udWxsCkBAIC0xLDQ0ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDMs IDIwMDYsIDIwMTMsIDIwMTUsIDIwMTYsIDIwMTcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNl cnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gYGBBUyBJUycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCi0g KiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURF TlRBTCwgU1BFQ0lBTCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICogUFJPRklUUzsg T1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WQotICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI3ByYWdt YSBvbmNlCi0KLSNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgotI2luY2x1ZGUgPHd0Zi9Gb3J3 YXJkLmg+Ci0jaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+Ci0jaW5jbHVkZSA8d3RmL3RleHQvV1RG U3RyaW5nLmg+Ci0KLW5hbWVzcGFjZSBQQUwgewotCi0jaWYgIUxPR19ESVNBQkxFRCB8fCAhUkVM RUFTRV9MT0dfRElTQUJMRUQKLQotU3RyaW5nIGxvZ0xldmVsU3RyaW5nKCk7Ci1ib29sIGlzTG9n Q2hhbm5lbEVuYWJsZWQoY29uc3QgU3RyaW5nJiBuYW1lKTsKLVBBTF9FWFBPUlQgdm9pZCBzZXRM b2dDaGFubmVsVG9BY2N1bXVsYXRlKGNvbnN0IFN0cmluZyYgbmFtZSk7Ci1QQUxfRVhQT1JUIHZv aWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3Nhcnkoc3RkOjpvcHRpb25hbDxTdHJpbmc+ ID0gc3RkOjpudWxsb3B0KTsKLQotI2VuZGlmIC8vICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0Vf TE9HX0RJU0FCTEVECi0KLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1BBTC9wYWwvTG9nZ2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL0xv Z2dpbmcuY3BwCmluZGV4IGFjODViNmQ4MjcxY2Q3ODc5ZmFlNjI4NzcwN2M2MmVhNWU2YjkxNTIu LmU2MjU0OGQ0Njc5MWY4ZmE3ZTExMzE2Yzc0M2Q5OGYxOTg4ZjdjMmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvTG9nZ2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9Mb2dnaW5nLmNwcApAQCAtMjYsMTAgKzI2LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJMb2dnaW5nLmgiCiAKLSNpbmNsdWRlICJMb2dJbml0aWFsaXphdGlvbi5oIgot Ci0jaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJp bmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JNKENP Q09BKQpAQCAtMzksNTAgKzM1LDYgQEAKIAogbmFtZXNwYWNlIFBBTCB7CiAKLSNpZiAhTE9HX0RJ U0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAotCi0jZGVmaW5lIERFRklORV9QQUxfTE9H X0NIQU5ORUwobmFtZSkgREVGSU5FX0xPR19DSEFOTkVMKG5hbWUsIExPR19DSEFOTkVMX1dFQktJ VF9TVUJTWVNURU0pCi1QQUxfTE9HX0NIQU5ORUxTKERFRklORV9QQUxfTE9HX0NIQU5ORUwpCi0K LXN0YXRpYyBXVEZMb2dDaGFubmVsKiBsb2dDaGFubmVsc1tdID0gewotICAgIFBBTF9MT0dfQ0hB Tk5FTFMoTE9HX0NIQU5ORUxfQUREUkVTUykKLX07Ci0KLXN0YXRpYyBjb25zdCBzaXplX3QgbG9n Q2hhbm5lbENvdW50ID0gV1RGX0FSUkFZX0xFTkdUSChsb2dDaGFubmVscyk7Ci0KLWJvb2wgaXNM b2dDaGFubmVsRW5hYmxlZChjb25zdCBTdHJpbmcmIG5hbWUpCi17Ci0gICAgV1RGTG9nQ2hhbm5l bCogY2hhbm5lbCA9IFdURkxvZ0NoYW5uZWxCeU5hbWUobG9nQ2hhbm5lbHMsIGxvZ0NoYW5uZWxD b3VudCwgbmFtZS51dGY4KCkuZGF0YSgpKTsKLSAgICBpZiAoIWNoYW5uZWwpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICByZXR1cm4gY2hhbm5lbC0+c3RhdGUgIT0gV1RGTG9nQ2hhbm5lbE9m ZjsKLX0KLQotc3RhdGljIGJvb2wgbG9nQ2hhbm5lbHNOZWVkSW5pdGlhbGl6YXRpb24gPSB0cnVl OwotCi12b2lkIHNldExvZ0NoYW5uZWxUb0FjY3VtdWxhdGUoY29uc3QgU3RyaW5nJiBuYW1lKQot ewotICAgIFdURkxvZ0NoYW5uZWwqIGNoYW5uZWwgPSBXVEZMb2dDaGFubmVsQnlOYW1lKGxvZ0No YW5uZWxzLCBsb2dDaGFubmVsQ291bnQsIG5hbWUudXRmOCgpLmRhdGEoKSk7Ci0gICAgaWYgKCFj aGFubmVsKQotICAgICAgICByZXR1cm47Ci0KLSAgICBjaGFubmVsLT5zdGF0ZSA9IFdURkxvZ0No YW5uZWxPbldpdGhBY2N1bXVsYXRpb247Ci0gICAgbG9nQ2hhbm5lbHNOZWVkSW5pdGlhbGl6YXRp b24gPSB0cnVlOwotfQotCi12b2lkIGluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHN0 ZDo6b3B0aW9uYWw8U3RyaW5nPiBsb2dDaGFubmVsU3RyaW5nKQotewotICAgIGlmICghbG9nQ2hh bm5lbHNOZWVkSW5pdGlhbGl6YXRpb24gJiYgIWxvZ0NoYW5uZWxTdHJpbmcpCi0gICAgICAgIHJl dHVybjsKLQotICAgIGxvZ0NoYW5uZWxzTmVlZEluaXRpYWxpemF0aW9uID0gZmFsc2U7Ci0KLSAg ICBTdHJpbmcgZW5hYmxlZENoYW5uZWxzU3RyaW5nID0gbG9nQ2hhbm5lbFN0cmluZyA/IGxvZ0No YW5uZWxTdHJpbmcudmFsdWUoKSA6IGxvZ0xldmVsU3RyaW5nKCk7Ci0gICAgV1RGSW5pdGlhbGl6 ZUxvZ0NoYW5uZWxTdGF0ZXNGcm9tU3RyaW5nKGxvZ0NoYW5uZWxzLCBsb2dDaGFubmVsQ291bnQs IGVuYWJsZWRDaGFubmVsc1N0cmluZy51dGY4KCkuZGF0YSgpKTsKLX0KLQotI2VuZGlmIC8vICFM T0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0KIHZvaWQgcmVnaXN0ZXJOb3Rp ZnlDYWxsYmFjayhjb25zdCBTdHJpbmcmIG5vdGlmeUlELCBXVEY6OkZ1bmN0aW9uPHZvaWQoKT4m JiBjYWxsYmFjaykKIHsKICNpZiBQTEFURk9STShDT0NPQSkKQEAgLTk3LDQgKzQ5LDMgQEAgdm9p ZCByZWdpc3Rlck5vdGlmeUNhbGxiYWNrKGNvbnN0IFN0cmluZyYgbm90aWZ5SUQsIFdURjo6RnVu Y3Rpb248dm9pZCgpPiYmIGNhbGwKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJDb3Jl L1BBTC9wYWwvTG9nZ2luZy5oCmluZGV4IDAzMTM5OWM2ZjcyYWQ4ZTM4Njc4Mjg0ODg5YjJhNTEy NzI5NGU2YTkuLjZjYWFlZGIzNWEwNTFkOWQ1M2UyYmEzMjQxY2E5MDAzYTNiMDFhNzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvTG9nZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL1BBTC9wYWwvTG9nZ2luZy5oCkBAIC0yNSwyOSArMjUsMTAgQEAKIAogI3ByYWdtYSBvbmNl CiAKLSNpbmNsdWRlICJMb2dNYWNyb3MuaCIKLSNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgog I2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKIG5hbWVzcGFjZSBQQUwgewogCi0jaWYgIUxPR19E SVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLQotI2lmbmRlZiBMT0dfQ0hBTk5FTF9Q UkVGSVgKLSNkZWZpbmUgTE9HX0NIQU5ORUxfUFJFRklYIFBBTExvZwotI2VuZGlmCi0KLSNkZWZp bmUgUEFMX0xPR19DSEFOTkVMUyhNKSBcCi0gICAgTShOZXR3b3JrKSBcCi0KLVBBTF9MT0dfQ0hB Tk5FTFMoREVDTEFSRV9MT0dfQ0hBTk5FTCkKLQotU3RyaW5nIGxvZ0xldmVsU3RyaW5nKCk7Ci1i b29sIGlzTG9nQ2hhbm5lbEVuYWJsZWQoY29uc3QgU3RyaW5nJiBuYW1lKTsKLVBBTF9FWFBPUlQg dm9pZCBzZXRMb2dDaGFubmVsVG9BY2N1bXVsYXRlKGNvbnN0IFN0cmluZyYgbmFtZSk7Ci0KLSNl bmRpZiAvLyAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAotCiBQQUxfRVhQ T1JUIHZvaWQgcmVnaXN0ZXJOb3RpZnlDYWxsYmFjayhjb25zdCBTdHJpbmcmLCBXVEY6OkZ1bmN0 aW9uPHZvaWQoKT4mJik7CiAKIH0gLy8gbmFtZXNwYWNlIFBBTApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvUEFML3BhbC9jb2NvYS9Mb2dnaW5nQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL2NvY29hL0xvZ2dpbmdDb2NvYS5tbQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMmNkY2VhMjIyZmY3MzZlYmQzMmMzYmY1ODg2YjBmMTBjMThhNDY4MC4uMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L2NvY29hL0xvZ2dpbmdDb2NvYS5tbQorKysgL2Rldi9udWxsCkBAIC0xLDQ4ICswLDAgQEAKLS8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDMsIDIwMDYsIDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoK LSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK LSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMu IE9SCi0gKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICogUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWQotICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQot I2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLQotI2luY2x1ZGUgPHd0 Zi90ZXh0L1dURlN0cmluZy5oPgotCi0jaWYgIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0df RElTQUJMRUQKLQotbmFtZXNwYWNlIFBBTCB7Ci0KLVN0cmluZyBsb2dMZXZlbFN0cmluZygpCi17 Ci0jaWYgIUxPR19ESVNBQkxFRAotICAgIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGRlZmF1bHRz RG9tYWluID0gQCJQQUxMb2dnaW5nIjsKLSAgICByZXR1cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c10gc3RyaW5nRm9yS2V5OmRlZmF1bHRzRG9tYWluXTsKLSNlbHNlCi0g ICAgcmV0dXJuIFN0cmluZygpOwotI2VuZGlmCi19Ci0KLX0KLQotI2VuZGlmIC8vICFMT0dfRElT QUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0K