201331 2019-08-29 22:49:23 -0700 [JSC] DFG ByteCodeParser should not copy JIT-related part of SimpleJumpTable 2019-08-30 03:00:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1566559 0 ysuzuki 2019-08-29 22:49:23 -0700 ... 1566560 1 ysuzuki 2019-08-29 22:50:03 -0700 <rdar://problem/53977605> 1566561 2 377679 ysuzuki 2019-08-29 22:54:34 -0700 Created attachment 377679 Patch 1566599 3 377679 mark.lam 2019-08-30 01:47:13 -0700 Comment on attachment 377679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377679&action=review r=me > Source/JavaScriptCore/ChangeLog:9 > + For example, ctiOffsets can be grown by Baseline JIT compiler. There is race condition as follows. Interesting. I've seen races between the mutator and the DFG before, but this is the first time I've heard of a race between the baselineJIT and the DFG. > Source/JavaScriptCore/bytecode/JumpTable.h:80 > // FIXME: The two Vectors can be combind into one Vector<OffsetLocation> Not your typo but might as well fix: /combind/combined/ > Source/JavaScriptCore/bytecode/JumpTable.h:122 > +#if ENABLE(DFG_JIT) > void clear() This looks legit to me, but I hope you've tested it with a test build with ENABLE_DFG_JIT set to false. 1566605 4 377679 ysuzuki 2019-08-30 02:54:15 -0700 Comment on attachment 377679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377679&action=review >> Source/JavaScriptCore/bytecode/JumpTable.h:80 >> // FIXME: The two Vectors can be combind into one Vector<OffsetLocation> > > Not your typo but might as well fix: /combind/combined/ Fixed. >> Source/JavaScriptCore/bytecode/JumpTable.h:122 >> void clear() > > This looks legit to me, but I hope you've tested it with a test build with ENABLE_DFG_JIT set to false. I checked this function is only called from DFGJITCompiler.cpp's finalizing timing, and make it `ENABLE(DFG_JIT)`. 1566607 5 ysuzuki 2019-08-30 03:00:35 -0700 Committed r249319: <https://trac.webkit.org/changeset/249319> 377679 2019-08-29 22:54:34 -0700 2019-08-30 01:47:13 -0700 Patch bug-201331-20190829225434.patch text/plain 6251 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj YzAzOGM1NWYxMzY2MWY4MTQxNGY3NzNmNTBiNzQzNjViNzNiODQ4Li44NjkzZjQ1Yzg2MGRiMmFk YmFjM2Y0YjJjNTY4MzZkOTA1MmE2NWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxOS0wOC0yOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIERGRyBCeXRlQ29kZVBhcnNlciBzaG91bGQgbm90IGNvcHkgSklU LXJlbGF0ZWQgcGFydCBvZiBTaW1wbGVKdW1wVGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTMzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbXBsZUp1bXBUYWJsZSdzIG5vbi1KSVQgcGFydCBp cyBub3QgY2hhbmdlZCBhZnRlciBDb2RlQmxvY2sgaXMgZmluYWxpemVkIHdlbGwuIE9uIHRoZSBv dGhlciBoYW5kLCBKSVQgcmVsYXRlZCBwYXJ0IGlzIGFsbG9jYXRlZCBvbi1kZW1hbmQuCisgICAg ICAgIEZvciBleGFtcGxlLCBjdGlPZmZzZXRzIGNhbiBiZSBncm93biBieSBCYXNlbGluZSBKSVQg Y29tcGlsZXIuIFRoZXJlIGlzIHJhY2UgY29uZGl0aW9uIGFzIGZvbGxvd3MuCisKKyAgICAgICAg ICAgIDEuIERGRyBCeXRlQ29kZVBhcnNlciBpcyBpbmxpbmluZyBhbmQgY29weWluZyBTaW1wbGVK dW1wVGFibGUKKyAgICAgICAgICAgIDIuIEJhc2VsaW5lIEpJVCBjb21waWxlciBpcyBleHBhbmRp bmcgSklULXJlbGF0ZWQgcGFydCBvZiBTaW1wbGVKdW1wVGFibGUKKworICAgICAgICBUaGVuLCAo MSkgcmVhZHMgdGhlIGJyb2tlbiBWZWN0b3IsIGFuZCBjcmFzaGVzLiBTaW5jZSBKSVQtcmVsYXRl ZCBwYXJ0IGlzIHVubmVjZXNzYXJ5IGluICgxKSwgd2Ugc2hvdWxkIG5vdCBjbG9uZSB0aGF0Lgor ICAgICAgICBUaGlzIHBhdGNoIGFkZHMgQ29kZUJsb2NrOjphZGRTd2l0Y2hKdW1wVGFibGVGcm9t UHJvZmlsZWRDb2RlQmxvY2ssIHdoaWNoIG9ubHkgY29waWVzIG5vbiBKSVQtcmVsYXRlZCBwYXJ0 IG9mIHRoZSBnaXZlbiBTaW1wbGVKdW1wVGFibGUgb2ZmZXJlZAorICAgICAgICBieSBwcm9maWxl ZCBDb2RlQmxvY2suCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAg KEpTQzo6Q29kZUJsb2NrOjphZGRTd2l0Y2hKdW1wVGFibGVGcm9tUHJvZmlsZWRDb2RlQmxvY2sp OgorICAgICAgICAqIGJ5dGVjb2RlL0p1bXBUYWJsZS5oOgorICAgICAgICAoSlNDOjpTaW1wbGVK dW1wVGFibGU6OmNsb25lTm9uSklUUGFydCBjb25zdCk6CisgICAgICAgIChKU0M6OlNpbXBsZUp1 bXBUYWJsZTo6Y2xlYXIpOgorICAgICAgICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6Cisg ICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OklubGluZVN0YWNrRW50cnk6OklubGlu ZVN0YWNrRW50cnkpOgorCiAyMDE5LTA4LTI5ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0pTQ10gUmVwYXRjaCBzaG91bGQgY29uc3RydWN0IENhbGxDYXNl cyBhbmQgQ2FzZXNWYWx1ZSBhdCB0aGUgc2FtZSB0aW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ29kZUJsb2NrLmgKaW5kZXggNmY5ZTFlZmZkZmQwOGViMzcwMDNkNjg1ZTQzMzI4 ZWM5YmMyZjNlNy4uNTQ2MDMwYzYxNzhiOTU4OWRlNzNlNjFiYTJlN2IwNzgwNzE4MWRlMCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaApAQCAtNTk4LDYgKzU5 OCwxMyBAQCBjbGFzcyBDb2RlQmxvY2sgOiBwdWJsaWMgSlNDZWxsIHsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgbV9yYXJlRGF0YS0+bV9zd2l0Y2hKdW1wVGFibGVzLmNsZWFyKCk7CiAg ICAgfQorI2lmIEVOQUJMRShERkdfSklUKQorICAgIHZvaWQgYWRkU3dpdGNoSnVtcFRhYmxlRnJv bVByb2ZpbGVkQ29kZUJsb2NrKFNpbXBsZUp1bXBUYWJsZSYgcHJvZmlsZWQpCisgICAgeworICAg ICAgICBjcmVhdGVSYXJlRGF0YUlmTmVjZXNzYXJ5KCk7CisgICAgICAgIG1fcmFyZURhdGEtPm1f c3dpdGNoSnVtcFRhYmxlcy5hcHBlbmQocHJvZmlsZWQuY2xvbmVOb25KSVRQYXJ0KCkpOworICAg IH0KKyNlbmRpZgogCiAgICAgc2l6ZV90IG51bWJlck9mU3RyaW5nU3dpdGNoSnVtcFRhYmxlcygp IGNvbnN0IHsgcmV0dXJuIG1fcmFyZURhdGEgPyBtX3JhcmVEYXRhLT5tX3N0cmluZ1N3aXRjaEp1 bXBUYWJsZXMuc2l6ZSgpIDogMDsgfQogICAgIFN0cmluZ0p1bXBUYWJsZSYgYWRkU3RyaW5nU3dp dGNoSnVtcFRhYmxlKCkgeyBjcmVhdGVSYXJlRGF0YUlmTmVjZXNzYXJ5KCk7IG1fcmFyZURhdGEt Pm1fc3RyaW5nU3dpdGNoSnVtcFRhYmxlcy5hcHBlbmQoU3RyaW5nSnVtcFRhYmxlKCkpOyByZXR1 cm4gbV9yYXJlRGF0YS0+bV9zdHJpbmdTd2l0Y2hKdW1wVGFibGVzLmxhc3QoKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0p1bXBUYWJsZS5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0p1bXBUYWJsZS5oCmluZGV4IGRhYWEyZTkyYjAwYWY0 NDIzYjk3NTYwN2ZjOGFjMjVkYjVlODkwZTguLjZjNGIxNDAxYzBiNzM3NmNhYzIzM2ViMjIwYTA4 N2FmZTIyOTcxYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9K dW1wVGFibGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvSnVtcFRhYmxl LmgKQEAgLTc5LDEyICs3OSwyMyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBzdHJ1Y3QgU2ltcGxl SnVtcFRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IFRoZSB0d28gVmVjdG9ycyBjYW4gYmUgY29t YmluZCBpbnRvIG9uZSBWZWN0b3I8T2Zmc2V0TG9jYXRpb24+CiAgICAgICAgIFZlY3RvcjxpbnQz Ml90PiBicmFuY2hPZmZzZXRzOwotICAgICAgICBpbnQzMl90IG1pbjsKKyAgICAgICAgaW50MzJf dCBtaW4geyBJTlQzMl9NSU4gfTsKICNpZiBFTkFCTEUoSklUKQogICAgICAgICBWZWN0b3I8Q29k ZUxvY2F0aW9uTGFiZWw8SlNTd2l0Y2hQdHJUYWc+PiBjdGlPZmZzZXRzOwogICAgICAgICBDb2Rl TG9jYXRpb25MYWJlbDxKU1N3aXRjaFB0clRhZz4gY3RpRGVmYXVsdDsKICNlbmRpZgogCisjaWYg RU5BQkxFKERGR19KSVQpCisgICAgICAgIC8vIEpJVCBwYXJ0IGNhbiBiZSBsYXRlciBleHBhbmRl ZCB3aXRob3V0IHRha2luZyBhIGxvY2sgd2hpbGUgbm9uLUpJVCBwYXJ0IGlzIHN0YWJsZSBhZnRl ciBDb2RlQmxvY2sgaXMgZmluYWxpemVkLgorICAgICAgICBTaW1wbGVKdW1wVGFibGUgY2xvbmVO b25KSVRQYXJ0KCkgY29uc3QKKyAgICAgICAgeworICAgICAgICAgICAgU2ltcGxlSnVtcFRhYmxl IHJlc3VsdDsKKyAgICAgICAgICAgIHJlc3VsdC5icmFuY2hPZmZzZXRzID0gYnJhbmNoT2Zmc2V0 czsKKyAgICAgICAgICAgIHJlc3VsdC5taW4gPSBtaW47CisgICAgICAgICAgICByZXR1cm4gcmVz dWx0OworICAgICAgICB9CisjZW5kaWYKKwogICAgICAgICBpbnQzMl90IG9mZnNldEZvclZhbHVl KGludDMyX3QgdmFsdWUsIGludDMyX3QgZGVmYXVsdE9mZnNldCk7CiAgICAgICAgIHZvaWQgYWRk KGludDMyX3Qga2V5LCBpbnQzMl90IG9mZnNldCkKICAgICAgICAgewpAQCAtMTA2LDE0ICsxMTcs MTQgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gY3RpRGVmYXVsdDsKICAg ICAgICAgfQogI2VuZGlmCi0gICAgICAgIAorCisjaWYgRU5BQkxFKERGR19KSVQpCiAgICAgICAg IHZvaWQgY2xlYXIoKQogICAgICAgICB7CiAgICAgICAgICAgICBicmFuY2hPZmZzZXRzLmNsZWFy KCk7Ci0jaWYgRU5BQkxFKEpJVCkKICAgICAgICAgICAgIGN0aU9mZnNldHMuY2xlYXIoKTsKLSNl bmRpZgogICAgICAgICB9CisjZW5kaWYKICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKaW5kZXgg YmZjZjUyYTk4MTUyYThmYTc1MzEwMWEzNjY2OThkNjlkYTY0YTNhNS4uYWExMjg1OTc0NmJhNTdi ZWZkNmI4MmJhMmY3ZWVkOWRhMDkyNGIyMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKQEAgLTcxMTUsNyArNzExNSw3IEBAIEJ5dGVDb2Rl UGFyc2VyOjpJbmxpbmVTdGFja0VudHJ5OjpJbmxpbmVTdGFja0VudHJ5KAogICAgICAgICB9CiAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjb2RlQmxvY2stPm51bWJlck9mU3dpdGNo SnVtcFRhYmxlcygpOyArK2kpIHsKICAgICAgICAgICAgIG1fc3dpdGNoUmVtYXBbaV0gPSBieXRl Q29kZVBhcnNlci0+bV9jb2RlQmxvY2stPm51bWJlck9mU3dpdGNoSnVtcFRhYmxlcygpOwotICAg ICAgICAgICAgYnl0ZUNvZGVQYXJzZXItPm1fY29kZUJsb2NrLT5hZGRTd2l0Y2hKdW1wVGFibGUo KSA9IGNvZGVCbG9jay0+c3dpdGNoSnVtcFRhYmxlKGkpOworICAgICAgICAgICAgYnl0ZUNvZGVQ YXJzZXItPm1fY29kZUJsb2NrLT5hZGRTd2l0Y2hKdW1wVGFibGVGcm9tUHJvZmlsZWRDb2RlQmxv Y2soY29kZUJsb2NrLT5zd2l0Y2hKdW1wVGFibGUoaSkpOwogICAgICAgICB9CiAgICAgfSBlbHNl IHsKICAgICAgICAgLy8gTWFjaGluZSBjb2RlIGJsb2NrIGNhc2UuCmRpZmYgLS1naXQgYS9KU1Rl c3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFkOTE3ZjBkOWU3MTJlOTYw MjVlNDhlY2FmZGU5ZWJjZDMyYTgwOTAuLjgyMmQ0NTUwOTdiMjU0MjhkMjU0ZGU2NmMxN2M0N2Rh OTc2ZmZhNDcgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDgtMjkgIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBbSlNDXSBERkcgQnl0ZUNvZGVQYXJzZXIgc2hvdWxk IG5vdCBjb3B5IEpJVC1yZWxhdGVkIHBhcnQgb2YgU2ltcGxlSnVtcFRhYmxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDEzMzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9zaW1wbGUtanVt cC10YWJsZS1jb3B5LmpzOiBBZGRlZC4KKyAgICAgICAgKGxldC5jb2RlKToKKyAgICAgICAgKGcy KToKKwogMjAxOS0wOC0yOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAg ICAgICAgIFtKU0NdIFJlcGF0Y2ggc2hvdWxkIGNvbnN0cnVjdCBDYWxsQ2FzZXMgYW5kIENhc2Vz VmFsdWUgYXQgdGhlIHNhbWUgdGltZQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvc2ltcGxl LWp1bXAtdGFibGUtY29weS5qcyBiL0pTVGVzdHMvc3RyZXNzL3NpbXBsZS1qdW1wLXRhYmxlLWNv cHkuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYjQ3YzhmOGYyY2IzMDQ1MjYwZjg0MmM5NDUyY2QwMjZiMmNjNWNi NAotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3NpbXBsZS1qdW1wLXRhYmxlLWNv cHkuanMKQEAgLTAsMCArMSwxMSBAQAorLy9AIHJ1bkRlZmF1bHQoIi0taml0UG9saWN5U2NhbGU9 MCIsICItLXVzZUNvZGVDYWNoZT0wIikKK2xldCBjb2RlID0gYAorZnVuY3Rpb24qIGcxKCkge30K K2Z1bmN0aW9uKiBnMigpIHt9CitnMSgpLm5leHQoKTsKK2cyKCkubmV4dCgpOworYDsKKworLy8g SW5jcmVhc2luZyB0byAxZTUgaW1wcm92ZXMgcmVwcm9kdWNpYmlsaXR5LgorZm9yICh2YXIgaT0w OyBpIDwgMWUzOyBpKyspCisgICAgcnVuU3RyaW5nKGNvZGUpOwo=