223963 2021-03-30 15:59:36 -0700 Add disableForwardingVPrintfStdErrToOSLog() and use it in the jsc shell. 2021-03-30 16:14:26 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1745383 0 mark.lam 2021-03-30 15:59:36 -0700 This prevents automatic forwarding of vprintf_stderr_common() to os_log_with_args(), which results in duplicate output when using the jsc shell. As a result, ASSERT fail messages and crash stack traces will be more readable. 1745388 1 424710 mark.lam 2021-03-30 16:05:38 -0700 Created attachment 424710 proposed patch. 1745391 2 mark.lam 2021-03-30 16:13:13 -0700 Thanks for the review. Landed in r275247: <http://trac.webkit.org/r275247>. 1745393 3 webkit-bug-importer 2021-03-30 16:14:26 -0700 <rdar://problem/76027030> 424710 2021-03-30 16:05:38 -0700 2021-03-30 16:09:05 -0700 proposed patch. bug-223963.patch text/plain 5278 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc1MjQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDIxLTAzLTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgZGlzYWJsZUZvcndhcmRpbmdWUHJpbnRmU3RkRXJyVG9PU0xvZygpIGFuZCB1c2UgaXQgaW4g dGhlIGpzYyBzaGVsbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMzk2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgcHJldmVudHMgYXV0b21hdGljIGZvcndhcmRpbmcgb2YgdnByaW50Zl9zdGRl cnJfY29tbW9uKCkgdG8gb3NfbG9nX3dpdGhfYXJncygpLAorICAgICAgICB3aGljaCByZXN1bHRz IGluIGR1cGxpY2F0ZSBvdXRwdXQgd2hlbiB1c2luZyB0aGUganNjIHNoZWxsLiAgQXMgYSByZXN1 bHQsIEFTU0VSVAorICAgICAgICBmYWlsIG1lc3NhZ2VzIGFuZCBjcmFzaCBzdGFjayB0cmFjZXMg d2lsbCBiZSBtb3JlIHJlYWRhYmxlLgorCisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKG1h aW4pOgorCiAyMDIxLTAzLTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGQgT3B0aW9uczo6ZXhpdE9uUmVzb3VyY2VFeGhhdXN0aW9uKCkgdG8gZW5hYmxlIGV4 aXRpbmcgaW5zdGVhZCBvZiBjcmFzaGluZyBvbiByZXNvdXJjZSBleGhhdXN0aW9uLgpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2pzYy5jcHAJKHJldmlzaW9uIDI3NTI0MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qc2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODI0LDYgKzI4MjQsOSBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgLy8geWV0LCBzaW5jZSB0aGF0IHdvdWxkIGRv IHNvbWV0aGluZ3MgdGhhdCB3ZSdkIGxpa2UgdG8gZGVmZXIgdW50aWwgYWZ0ZXIgd2UKICAgICAv LyBoYXZlIGEgY2hhbmNlIHRvIHBhcnNlIG9wdGlvbnMuCiAgICAgV1RGOjppbml0aWFsaXplKCk7 CisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgV1RGOjpkaXNhYmxlRm9yd2FyZGluZ1ZQcmludGZT dGRFcnJUb09TTG9nKCk7CisjZW5kaWYKIAogICAgIC8vIFdlIGNhbid0IHVzZSBkZXN0cnVjdG9y cyBpbiB0aGUgZm9sbG93aW5nIGNvZGUgYmVjYXVzZSBpdCB1c2VzIFdpbmRvd3MKICAgICAvLyBT dHJ1Y3R1cmVkIEV4Y2VwdGlvbiBIYW5kbGluZwpJbmRleDogU291cmNlL1dURi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dURi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3NTI0MSkKKysr IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MjEtMDMtMzAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBk aXNhYmxlRm9yd2FyZGluZ1ZQcmludGZTdGRFcnJUb09TTG9nKCkgYW5kIHVzZSBpdCBpbiB0aGUg anNjIHNoZWxsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjIzOTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiB3dGYvQXNzZXJ0aW9ucy5jcHA6CisgICAgICAgIChXVEY6OmRpc2FibGVGb3J3YXJkaW5n VlByaW50ZlN0ZEVyclRvT1NMb2cpOgorICAgICAgICAqIHd0Zi9Bc3NlcnRpb25zLmg6CisgICAg ICAgICogd3RmL1dURkNvbmZpZy5oOgorCiAyMDIxLTAzLTI5ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIHRlcm1pbmF0ZV93aXRoX3Jl YXNvbiBpbnN0ZWFkIG9mIHhwY19jb25uZWN0aW9uX2tpbGwKSW5kZXg6IFNvdXJjZS9XVEYvd3Rm L0Fzc2VydGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMu Y3BwCShyZXZpc2lvbiAyNzUyNDEpCisrKyBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDMt MjAxOSBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDAzLTIwMjEgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAo QykgMjAwNy0yMDA5IFRvcmNoIE1vYmlsZSwgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDExIFVu aXZlcnNpdHkgb2YgU3plZ2VkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTM3LDYgKzM3 LDcgQEAKICNpbmNsdWRlIDx3dGYvTG9nZ2luZ0FjY3VtdWxhdG9yLmg+CiAjaW5jbHVkZSA8d3Rm L1ByaW50U3RyZWFtLmg+CiAjaW5jbHVkZSA8d3RmL1N0YWNrVHJhY2UuaD4KKyNpbmNsdWRlIDx3 dGYvV1RGQ29uZmlnLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUg PHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KQEAgLTExNCw3ICsxMTUsMTQgQEAgV1RGX0FUVFJJQlVURV9QUklOVEYoMSwgMCkgc3RhdGlj IFN0cmluZwogICAgIHJldHVybiBTdHJpbmdJbXBsOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxj b25zdCBMQ2hhcio+KGJ1ZmZlci5kYXRhKCkpLCBsZW5ndGgpOwogfQogCisjaWYgUExBVEZPUk0o Q09DT0EpCit2b2lkIGRpc2FibGVGb3J3YXJkaW5nVlByaW50ZlN0ZEVyclRvT1NMb2coKQorewor ICAgIGdfd3RmQ29uZmlnLmRpc2FibGVGb3J3YXJkaW5nVlByaW50ZlN0ZEVyclRvT1NMb2cgPSB0 cnVlOwogfQorI2VuZGlmCisKK30gLy8gbmFtZXNwYWNlIFdURgogCiBleHRlcm4gIkMiIHsKIApA QCAtMTQ3LDEwICsxNTUsMTIgQEAgc3RhdGljIHZvaWQgdnByaW50Zl9zdGRlcnJfY29tbW9uKGNv bnN0IAogICAgIH0KIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZhX2xpc3QgY29weU9mQXJn czsKLSAgICB2YV9jb3B5KGNvcHlPZkFyZ3MsIGFyZ3MpOwotICAgIG9zX2xvZ193aXRoX2FyZ3Mo T1NfTE9HX0RFRkFVTFQsIE9TX0xPR19UWVBFX0RFRkFVTFQsIGZvcm1hdCwgY29weU9mQXJncywg X19idWlsdGluX3JldHVybl9hZGRyZXNzKDApKTsKLSAgICB2YV9lbmQoY29weU9mQXJncyk7Cisg ICAgaWYgKCFnX3d0ZkNvbmZpZy5kaXNhYmxlRm9yd2FyZGluZ1ZQcmludGZTdGRFcnJUb09TTG9n KSB7CisgICAgICAgIHZhX2xpc3QgY29weU9mQXJnczsKKyAgICAgICAgdmFfY29weShjb3B5T2ZB cmdzLCBhcmdzKTsKKyAgICAgICAgb3NfbG9nX3dpdGhfYXJncyhPU19MT0dfREVGQVVMVCwgT1Nf TE9HX1RZUEVfREVGQVVMVCwgZm9ybWF0LCBjb3B5T2ZBcmdzLCBfX2J1aWx0aW5fcmV0dXJuX2Fk ZHJlc3MoMCkpOworICAgICAgICB2YV9lbmQoY29weU9mQXJncyk7CisgICAgfQogI2VuZGlmCiAK ICAgICAvLyBGYWxsIHRocm91Z2ggdG8gd3JpdGUgdG8gc3RkZXJyIGluIHRoZSBzYW1lIG1hbm5l ciBhcyBvdGhlciBwbGF0Zm9ybXMuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5oCShyZXZpc2lvbiAyNzUy NDEpCisrKyBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4 MCw3ICs2ODAsMTIgQEAgdm9pZCBpc0ludGVncmFsT3JQb2ludGVyVHlwZShULCBUeXBlcy4uLgog ICAgIHN0YXRpY19hc3NlcnQoc3RkOjppc19pbnRlZ3JhbDxUPjo6dmFsdWUgfHwgc3RkOjppc19l bnVtPFQ+Ojp2YWx1ZSB8fCBzdGQ6OmlzX3BvaW50ZXI8VD46OnZhbHVlLCAiQWxsIHR5cGVzIG5l ZWQgdG8gYmUgYml0d2lzZV9jYXN0LWFibGUgdG8gaW50ZWdyYWwgdHlwZSBmb3IgbG9nZ2luZyIp OwogICAgIGlzSW50ZWdyYWxPclBvaW50ZXJUeXBlKHR5cGVzLi4uKTsKIH0KLX0KKworI2lmIFBM QVRGT1JNKENPQ09BKQorV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGlzYWJsZUZvcndhcmRpbmdW UHJpbnRmU3RkRXJyVG9PU0xvZygpOworI2VuZGlmCisKK30gLy8gbmFtZXNwYWNlIFdURgogCiBp bmxpbmUgdm9pZCBjb21waWxlckZlbmNlRm9yQ3Jhc2goKQogewpJbmRleDogU291cmNlL1dURi93 dGYvV1RGQ29uZmlnLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvV1RGQ29uZmlnLmgJ KHJldmlzaW9uIDI3NTI0MSkKKysrIFNvdXJjZS9XVEYvd3RmL1dURkNvbmZpZy5oCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAtMjAyMSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKQEAgLTY5LDYgKzY5LDkgQEAgc3RydWN0IENvbmZpZyB7CiAgICAgLy8gYXMgYSBnbG9iYWwg c2luZ2xldG9uLgogCiAgICAgYm9vbCBpc1Blcm1hbmVudGx5RnJvemVuOworI2lmIFBMQVRGT1JN KENPQ09BKQorICAgIGJvb2wgZGlzYWJsZUZvcndhcmRpbmdWUHJpbnRmU3RkRXJyVG9PU0xvZzsK KyNlbmRpZgogCiAjaWYgVVNFKFBUSFJFQURTKQogICAgIGJvb2wgaXNVc2VyU3BlY2lmaWVkVGhy ZWFkU3VzcGVuZFJlc3VtZVNpZ25hbENvbmZpZ3VyZWQ7Cg==