212382 2020-05-26 12:17:41 -0700 SamplingProfiler::takeSample() should not assume that ENABLE(WEBASSEMBLY) means Wasm is enabled. 2020-05-26 14:33:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1656123 0 mark.lam 2020-05-26 12:17:41 -0700 Fixing this will allow sampling profiler tests to run with JSC_useJIT=0 without crashing. 1656125 1 400267 mark.lam 2020-05-26 12:20:45 -0700 Created attachment 400267 proposed patch. 1656126 2 400267 saam 2020-05-26 12:23:25 -0700 Comment on attachment 400267 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=400267&action=review > Source/JavaScriptCore/ChangeLog:3 > + SamplingProfiler::takeSample() should assume that ENABLE(WEBASSEMBLY) means Wasm is enabled. should => should not 1656129 3 400267 saam 2020-05-26 12:26:10 -0700 Comment on attachment 400267 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=400267&action=review > Source/JavaScriptCore/runtime/SamplingProfiler.cpp:357 > + Lock unusedLock; > + auto wasmCalleesLocker = holdLock(Wasm::isSupported() ? Wasm::CalleeRegistry::singleton().getLock() : unusedLock); why not just use Optional<LockHolder>? Seems cleaner than this unusedLock approach 1656161 4 400270 mark.lam 2020-05-26 13:49:15 -0700 Created attachment 400270 proposed patch. 1656179 5 ews-feeder 2020-05-26 14:32:54 -0700 Committed r262161: <https://trac.webkit.org/changeset/262161> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400270. 1656180 6 webkit-bug-importer 2020-05-26 14:33:25 -0700 <rdar://problem/63642209> 400267 2020-05-26 12:20:45 -0700 2020-05-26 13:49:15 -0700 proposed patch. bug-212382.patch text/plain 2182 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYyMTUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDIwLTA1LTI2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT YW1wbGluZ1Byb2ZpbGVyOjp0YWtlU2FtcGxlKCkgc2hvdWxkIGFzc3VtZSB0aGF0IEVOQUJMRShX RUJBU1NFTUJMWSkgbWVhbnMgV2FzbSBpcyBlbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2FzbSBjYW4gc3RpbGwgYmUgZGlzYWJsZWQgYXQg cnVudGltZSB3aXRoIEpTQyBvcHRpb25zLiAgRml4aW5nIHRoaXMgd2lsbCBhbGxvdworICAgICAg ICBzYW1wbGluZyBwcm9maWxlciB0ZXN0cyB0byBydW4gd2l0aCBKU0NfdXNlSklUPTAgd2l0aG91 dCBjcmFzaGluZy4KKworICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHA6Cisg ICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnRha2VTYW1wbGUpOgorCiAyMDIwLTA1LTI2 ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgdGhl IHVzZSBvZiBYQ0J1aWxkIGJ5IGRlZmF1bHQgaW4gQXBwbGUgYnVpbGRzCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAkocmV2 aXNpb24gMjYyMTUzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQ cm9maWxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDE2LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAi Vk0uaCIKICNpbmNsdWRlICJXYXNtQ2FsbGVlLmgiCiAjaW5jbHVkZSAiV2FzbUNhbGxlZVJlZ2lz dHJ5LmgiCisjaW5jbHVkZSAiV2FzbUNhcGFiaWxpdGllcy5oIgogI2luY2x1ZGUgPHd0Zi9GaWxl UHJpbnRTdHJlYW0uaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9S ZWZQdHIuaD4KQEAgLTM1Miw3ICszNTMsOCBAQCB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnRha2VT YW1wbGUoY29uc3QgCiAgICAgICAgIGF1dG8gY29kZUJsb2NrU2V0TG9ja2VyID0gaG9sZExvY2so bV92bS5oZWFwLmNvZGVCbG9ja1NldCgpLmdldExvY2soKSk7CiAgICAgICAgIGF1dG8gZXhlY3V0 YWJsZUFsbG9jYXRvckxvY2tlciA9IGhvbGRMb2NrKEV4ZWN1dGFibGVBbGxvY2F0b3I6OnNpbmds ZXRvbigpLmdldExvY2soKSk7CiAjaWYgRU5BQkxFKFdFQkFTU0VNQkxZKQotICAgICAgICBhdXRv IHdhc21DYWxsZWVzTG9ja2VyID0gaG9sZExvY2soV2FzbTo6Q2FsbGVlUmVnaXN0cnk6OnNpbmds ZXRvbigpLmdldExvY2soKSk7CisgICAgICAgIExvY2sgdW51c2VkTG9jazsKKyAgICAgICAgYXV0 byB3YXNtQ2FsbGVlc0xvY2tlciA9ICBob2xkTG9jayhXYXNtOjppc1N1cHBvcnRlZCgpID8gV2Fz bTo6Q2FsbGVlUmVnaXN0cnk6OnNpbmdsZXRvbigpLmdldExvY2soKSA6IHVudXNlZExvY2spOwog I2Vsc2UKICAgICAgICAgTG9ja0hvbGRlciB3YXNtQ2FsbGVlc0xvY2tlcihOb0xvY2tpbmdOZWNl c3NhcnkpOwogI2VuZGlmCg== 400270 2020-05-26 13:49:15 -0700 2020-05-26 14:32:55 -0700 proposed patch. bug-212382.patch text/plain 4812 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYyMTYwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDIwLTA1LTI2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT YW1wbGluZ1Byb2ZpbGVyOjp0YWtlU2FtcGxlKCkgc2hvdWxkIG5vdCBhc3N1bWUgdGhhdCBFTkFC TEUoV0VCQVNTRU1CTFkpIG1lYW5zIFdhc20gaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjM4MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdhc20gY2FuIHN0aWxsIGJlIGRpc2FibGVk IGF0IHJ1bnRpbWUgd2l0aCBKU0Mgb3B0aW9ucy4gIEZpeGluZyB0aGlzIHdpbGwgYWxsb3cKKyAg ICAgICAgc2FtcGxpbmcgcHJvZmlsZXIgdGVzdHMgdG8gcnVuIHdpdGggSlNDX3VzZUpJVD0wIHdp dGhvdXQgY3Jhc2hpbmcuCisKKyAgICAgICAgKiBydW50aW1lL1NhbXBsaW5nUHJvZmlsZXIuY3Bw OgorICAgICAgICAoSlNDOjpGcmFtZVdhbGtlcjo6RnJhbWVXYWxrZXIpOgorICAgICAgICAoSlND OjpGcmFtZVdhbGtlcjo6cmVjb3JkSklURnJhbWUpOgorICAgICAgICAoSlNDOjpDRnJhbWVXYWxr ZXI6OkNGcmFtZVdhbGtlcik6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnRha2VT YW1wbGUpOgorCiAyMDIwLTA1LTI2ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4K IAogICAgICAgICBFbmFibGUgdGhlIHVzZSBvZiBYQ0J1aWxkIGJ5IGRlZmF1bHQgaW4gQXBwbGUg YnVpbGRzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2Zp bGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1w bGluZ1Byb2ZpbGVyLmNwcAkocmV2aXNpb24gMjYyMTUzKQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Miw2 ICs0Miw3IEBACiAjaW5jbHVkZSAiVk0uaCIKICNpbmNsdWRlICJXYXNtQ2FsbGVlLmgiCiAjaW5j bHVkZSAiV2FzbUNhbGxlZVJlZ2lzdHJ5LmgiCisjaW5jbHVkZSAiV2FzbUNhcGFiaWxpdGllcy5o IgogI2luY2x1ZGUgPHd0Zi9GaWxlUHJpbnRTdHJlYW0uaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNl dC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KQEAgLTczLDcgKzc0LDcgQEAgQUxXQVlTX0lO TElORSBzdGF0aWMgdm9pZCByZXBvcnRTdGF0cygpCiAKIGNsYXNzIEZyYW1lV2Fsa2VyIHsKIHB1 YmxpYzoKLSAgICBGcmFtZVdhbGtlcihWTSYgdm0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25z dCBBYnN0cmFjdExvY2tlciYgY29kZUJsb2NrU2V0TG9ja2VyLCBjb25zdCBBYnN0cmFjdExvY2tl ciYgbWFjaGluZVRocmVhZHNMb2NrZXIsIGNvbnN0IEFic3RyYWN0TG9ja2VyJiB3YXNtQ2FsbGVl TG9ja2VyKQorICAgIEZyYW1lV2Fsa2VyKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNv bnN0IEFic3RyYWN0TG9ja2VyJiBjb2RlQmxvY2tTZXRMb2NrZXIsIGNvbnN0IEFic3RyYWN0TG9j a2VyJiBtYWNoaW5lVGhyZWFkc0xvY2tlciwgY29uc3QgT3B0aW9uYWw8TG9ja0hvbGRlcj4mIHdh c21DYWxsZWVMb2NrZXIpCiAgICAgICAgIDogbV92bSh2bSkKICAgICAgICAgLCBtX2NhbGxGcmFt ZShjYWxsRnJhbWUpCiAgICAgICAgICwgbV9lbnRyeUZyYW1lKHZtLnRvcEVudHJ5RnJhbWUpCkBA IC0xMjEsOSArMTIyLDkgQEAgcHJvdGVjdGVkOgogICAgICAgICB9CiAgICAgICAgIHN0YWNrVHJh Y2VbbV9kZXB0aF0gPSBVbnByb2Nlc3NlZFN0YWNrRnJhbWUoY29kZUJsb2NrLCB1bnNhZmVDYWxs ZWUsIGNhbGxTaXRlSW5kZXgpOwogI2lmIEVOQUJMRShXRUJBU1NFTUJMWSkKLSAgICAgICAgaWYg KHVuc2FmZUNhbGxlZS5pc1dhc20oKSkgeworICAgICAgICBpZiAoV2FzbTo6aXNTdXBwb3J0ZWQo KSAmJiB1bnNhZmVDYWxsZWUuaXNXYXNtKCkpIHsKICAgICAgICAgICAgIGF1dG8qIHdhc21DYWxs ZWUgPSB1bnNhZmVDYWxsZWUuYXNXYXNtQ2FsbGVlKCk7Ci0gICAgICAgICAgICBpZiAoV2FzbTo6 Q2FsbGVlUmVnaXN0cnk6OnNpbmdsZXRvbigpLmlzVmFsaWRDYWxsZWUobV93YXNtQ2FsbGVlTG9j a2VyLCB3YXNtQ2FsbGVlKSkgeworICAgICAgICAgICAgaWYgKFdhc206OkNhbGxlZVJlZ2lzdHJ5 OjpzaW5nbGV0b24oKS5pc1ZhbGlkQ2FsbGVlKCptX3dhc21DYWxsZWVMb2NrZXIsIHdhc21DYWxs ZWUpKSB7CiAgICAgICAgICAgICAgICAgLy8gQXQgdGhpcyBwb2ludCwgV2FzbTo6Q2FsbGVlIHdv dWxkIGJlIGR5aW5nIChyZWYgY291bnQgaXMgMCksIGJ1dCBpdHMgZmllbGRzIGFyZSBzdGlsbCBs aXZlLgogICAgICAgICAgICAgICAgIC8vIEFuZCB3ZSBjYW4gc2FmZWx5IGNvcHkgV2FzbTo6SW5k ZXhPck5hbWUgZXZlbiB3aGVuIGFueSBsb2NrIGlzIGhlbGQgYnkgc3VzcGVuZGVkIHRocmVhZHMu CiAgICAgICAgICAgICAgICAgc3RhY2tUcmFjZVttX2RlcHRoXS53YXNtSW5kZXhPck5hbWUgPSB3 YXNtQ2FsbGVlLT5pbmRleE9yTmFtZSgpOwpAQCAtMTk5LDcgKzIwMCw3IEBAIHByb3RlY3RlZDoK ICAgICBFbnRyeUZyYW1lKiBtX2VudHJ5RnJhbWU7CiAgICAgY29uc3QgQWJzdHJhY3RMb2NrZXIm IG1fY29kZUJsb2NrU2V0TG9ja2VyOwogICAgIGNvbnN0IEFic3RyYWN0TG9ja2VyJiBtX21hY2hp bmVUaHJlYWRzTG9ja2VyOwotICAgIGNvbnN0IEFic3RyYWN0TG9ja2VyJiBtX3dhc21DYWxsZWVM b2NrZXI7CisgICAgY29uc3QgT3B0aW9uYWw8TG9ja0hvbGRlcj4mIG1fd2FzbUNhbGxlZUxvY2tl cjsKICAgICBib29sIG1fYmFpbGluZ091dCB7IGZhbHNlIH07CiAgICAgc2l6ZV90IG1fZGVwdGgg eyAwIH07CiB9OwpAQCAtMjA4LDcgKzIwOSw3IEBAIGNsYXNzIENGcmFtZVdhbGtlciA6IHB1Ymxp YyBGcmFtZVdhbGtlciAKIHB1YmxpYzoKICAgICB0eXBlZGVmIEZyYW1lV2Fsa2VyIEJhc2U7CiAK LSAgICBDRnJhbWVXYWxrZXIoVk0mIHZtLCB2b2lkKiBtYWNoaW5lRnJhbWUsIENhbGxGcmFtZSog Y2FsbEZyYW1lLCBjb25zdCBBYnN0cmFjdExvY2tlciYgY29kZUJsb2NrU2V0TG9ja2VyLCBjb25z dCBBYnN0cmFjdExvY2tlciYgbWFjaGluZVRocmVhZHNMb2NrZXIsIGNvbnN0IEFic3RyYWN0TG9j a2VyJiB3YXNtQ2FsbGVlTG9ja2VyKQorICAgIENGcmFtZVdhbGtlcihWTSYgdm0sIHZvaWQqIG1h Y2hpbmVGcmFtZSwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNvbnN0IEFic3RyYWN0TG9ja2VyJiBj b2RlQmxvY2tTZXRMb2NrZXIsIGNvbnN0IEFic3RyYWN0TG9ja2VyJiBtYWNoaW5lVGhyZWFkc0xv Y2tlciwgY29uc3QgT3B0aW9uYWw8TG9ja0hvbGRlcj4mIHdhc21DYWxsZWVMb2NrZXIpCiAgICAg ICAgIDogQmFzZSh2bSwgY2FsbEZyYW1lLCBjb2RlQmxvY2tTZXRMb2NrZXIsIG1hY2hpbmVUaHJl YWRzTG9ja2VyLCB3YXNtQ2FsbGVlTG9ja2VyKQogICAgICAgICAsIG1fbWFjaGluZUZyYW1lKG1h Y2hpbmVGcmFtZSkKICAgICB7CkBAIC0zNTEsMTAgKzM1MiwxMCBAQCB2b2lkIFNhbXBsaW5nUHJv ZmlsZXI6OnRha2VTYW1wbGUoY29uc3QgCiAgICAgICAgIGF1dG8gbWFjaGluZVRocmVhZHNMb2Nr ZXIgPSBob2xkTG9jayhtX3ZtLmhlYXAubWFjaGluZVRocmVhZHMoKS5nZXRMb2NrKCkpOwogICAg ICAgICBhdXRvIGNvZGVCbG9ja1NldExvY2tlciA9IGhvbGRMb2NrKG1fdm0uaGVhcC5jb2RlQmxv Y2tTZXQoKS5nZXRMb2NrKCkpOwogICAgICAgICBhdXRvIGV4ZWN1dGFibGVBbGxvY2F0b3JMb2Nr ZXIgPSBob2xkTG9jayhFeGVjdXRhYmxlQWxsb2NhdG9yOjpzaW5nbGV0b24oKS5nZXRMb2NrKCkp OworICAgICAgICBPcHRpb25hbDxMb2NrSG9sZGVyPiB3YXNtQ2FsbGVlc0xvY2tlcjsKICNpZiBF TkFCTEUoV0VCQVNTRU1CTFkpCi0gICAgICAgIGF1dG8gd2FzbUNhbGxlZXNMb2NrZXIgPSBob2xk TG9jayhXYXNtOjpDYWxsZWVSZWdpc3RyeTo6c2luZ2xldG9uKCkuZ2V0TG9jaygpKTsKLSNlbHNl Ci0gICAgICAgIExvY2tIb2xkZXIgd2FzbUNhbGxlZXNMb2NrZXIoTm9Mb2NraW5nTmVjZXNzYXJ5 KTsKKyAgICAgICAgaWYgKFdhc206OmlzU3VwcG9ydGVkKCkpCisgICAgICAgICAgICB3YXNtQ2Fs bGVlc0xvY2tlciA9IGhvbGRMb2NrKFdhc206OkNhbGxlZVJlZ2lzdHJ5OjpzaW5nbGV0b24oKS5n ZXRMb2NrKCkpOwogI2VuZGlmCiAKICAgICAgICAgYXV0byBkaWRTdXNwZW5kID0gbV9qc2NFeGVj dXRpb25UaHJlYWQtPnN1c3BlbmQoKTsK