178134 2017-10-10 10:29:59 -0700 Fix compilation when MASM_PROBE (and therefore DFG) are disabled 2017-10-10 16:15:36 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 guijemont webkit-unassigned aperez buildbot commit-queue keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1358787 0 guijemont 2017-10-10 10:29:59 -0700 Since r222871, JavaScriptCore does not compile if MASM_PROBE is disabled. Some code provided in this revision need to be protected by #if ENABLED(MASM_PROBE). 1358790 1 323318 guijemont 2017-10-10 10:37:34 -0700 Created attachment 323318 Patch Patch fixing the issue. 1358808 2 323318 aperez 2017-10-10 11:12:35 -0700 Comment on attachment 323318 Patch Informal review: r+ 1358834 3 323318 saam 2017-10-10 12:21:21 -0700 Comment on attachment 323318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323318&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2323 > +#if ENABLE(MASM_PROBE) This should be: #if ENABLE(DFGJIT) or whatever the correct ENABLE name is > Source/JavaScriptCore/bytecode/CodeBlock.h:80 > +#if ENABLE(MASM_PROBE) ditto > Source/JavaScriptCore/bytecode/CodeBlock.h:774 > +#if ENABLE(MASM_PROBE) > OptimizeAction updateOSRExitCounterAndCheckIfNeedToReoptimize(DFG::OSRExitState&); > +#endif ditto 1358914 4 323351 guijemont 2017-10-10 14:27:45 -0700 Created attachment 323351 Patch New version using ENABLE(DFG_JIT) 1358959 5 323351 commit-queue 2017-10-10 16:14:16 -0700 Comment on attachment 323351 Patch Clearing flags on attachment: 323351 Committed r223155: <http://trac.webkit.org/changeset/223155> 1358960 6 commit-queue 2017-10-10 16:14:17 -0700 All reviewed patches have been landed. Closing bug. 1358961 7 webkit-bug-importer 2017-10-10 16:15:36 -0700 <rdar://problem/34922580> 323318 2017-10-10 10:37:34 -0700 2017-10-10 14:27:42 -0700 Patch bug-178134-20171010123726.patch text/plain 2609 guijemont U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NmMyZjFkMDI3YzViMWQ2YzVkYWU2MTcwOTBhZTBjMzdlNTBhYjlkLi5jZjhjNTA0MDBhYWY3NjJm NDk1MjcwOGQwYzY5MDRiM2RkNmFkNmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNy0xMC0xMCAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxp YS5jb20+CisKKyAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdoZW4gTUFTTV9QUk9CRSAoYW5kIHRo ZXJlZm9yZSBERkcpIGFyZSBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAqIGJ5 dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICBEaXNhYmxlIHNvbWUgY29kZSB3aGVuIGJ1aWxk aW5nIHdpdGhvdXQgTUFTTV9QUk9CRS4KKwogMjAxNy0xMC0xMCAgU2FhbSBCYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBUaGUgcHJvdG90eXBlIGNhY2hlIHNob3VsZCBiZSBh d2FyZSBvZiB0aGUgRXhlY3V0YWJsZSBpdCBnZW5lcmF0ZXMgYSBTdHJ1Y3R1cmUgZm9yCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDc1ZDFjMGFi ZTQxYTEzMTgyNTNlM2UzYWFkZThkMDI0MmZjYjUyNWQuLmE3MTIyZmFmODdmZmNkZGU3MTkzYWI3 MTMzMDFiZTBiZGIxNmNlNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9Db2RlQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2suY3BwCkBAIC0yMzIwLDYgKzIzMjAsNyBAQCBib29sIENvZGVCbG9jazo6Y2hlY2tJ Zk9wdGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQoKQogICAgIHJldHVybiBtX2ppdEV4ZWN1dGVD b3VudGVyLmNoZWNrSWZUaHJlc2hvbGRDcm9zc2VkQW5kU2V0KHRoaXMpOwogfQogCisjaWYgRU5B QkxFKE1BU01fUFJPQkUpCiBhdXRvIENvZGVCbG9jazo6dXBkYXRlT1NSRXhpdENvdW50ZXJBbmRD aGVja0lmTmVlZFRvUmVvcHRpbWl6ZShERkc6Ok9TUkV4aXRTdGF0ZSYgZXhpdFN0YXRlKSAtPiBP cHRpbWl6ZUFjdGlvbgogewogICAgIERGRzo6T1NSRXhpdEJhc2UmIGV4aXQgPSBleGl0U3RhdGUu ZXhpdDsKQEAgLTIzNjYsNiArMjM2Nyw3IEBAIGF1dG8gQ29kZUJsb2NrOjp1cGRhdGVPU1JFeGl0 Q291bnRlckFuZENoZWNrSWZOZWVkVG9SZW9wdGltaXplKERGRzo6T1NSRXhpdFN0YXRlCiAgICAg YmFzZWxpbmVDb2RlQmxvY2stPm1faml0RXhlY3V0ZUNvdW50ZXIuc2V0TmV3VGhyZXNob2xkRm9y T1NSRXhpdChleGl0U3RhdGUuYWN0aXZlVGhyZXNob2xkLCBleGl0U3RhdGUubWVtb3J5VXNhZ2VB ZGp1c3RlZFRocmVzaG9sZCk7CiAgICAgcmV0dXJuIE9wdGltaXplQWN0aW9uOjpOb25lOwogfQor I2VuZGlmCiAKIHZvaWQgQ29kZUJsb2NrOjpvcHRpbWl6ZU5leHRJbnZvY2F0aW9uKCkKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAppbmRleCBkZWNmOWM3YjY1 ZWEzMDNmMWM3NzcwY2NlOWU0MTZhZGRiOWU1YzhhLi4zN2U5NzJiYzQyNmI0MzJlOTdiOGQ5ZTQw NDg5MzRmMDIwNjgyOTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvQ29kZUJsb2NrLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVC bG9jay5oCkBAIC03Nyw5ICs3NywxMSBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAorI2lmIEVOQUJM RShNQVNNX1BST0JFKQogbmFtZXNwYWNlIERGRyB7CiBzdHJ1Y3QgT1NSRXhpdFN0YXRlOwogfSAv LyBuYW1lc3BhY2UgREZHCisjZW5kaWYKIAogY2xhc3MgQnl0ZWNvZGVMaXZlbmVzc0FuYWx5c2lz OwogY2xhc3MgQ29kZUJsb2NrU2V0OwpAQCAtNzY3LDcgKzc2OSw5IEBAIHB1YmxpYzoKICAgICB2 b2lkIGNvdW50T1NSRXhpdCgpIHsgbV9vc3JFeGl0Q291bnRlcisrOyB9CiAKICAgICBlbnVtIGNs YXNzIE9wdGltaXplQWN0aW9uIHsgTm9uZSwgUmVvcHRpbWl6ZU5vdyB9OworI2lmIEVOQUJMRShN QVNNX1BST0JFKQogICAgIE9wdGltaXplQWN0aW9uIHVwZGF0ZU9TUkV4aXRDb3VudGVyQW5kQ2hl Y2tJZk5lZWRUb1Jlb3B0aW1pemUoREZHOjpPU1JFeGl0U3RhdGUmKTsKKyNlbmRpZgogCiAgICAg c3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZk9TUkV4aXRDb3VudGVyKCkgeyByZXR1cm4gT0JKRUNU X09GRlNFVE9GKENvZGVCbG9jaywgbV9vc3JFeGl0Q291bnRlcik7IH0KIAo= 323351 2017-10-10 14:27:45 -0700 2017-10-10 16:14:16 -0700 Patch bug-178134-20171010162736.patch text/plain 2597 guijemont U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NmMyZjFkMDI3YzViMWQ2YzVkYWU2MTcwOTBhZTBjMzdlNTBhYjlkLi43OGIzNTU2M2NmNDg1ZDgy ODRjMDZkN2QwY2IyNmMzMzEwZDVkNTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNy0xMC0xMCAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxp YS5jb20+CisKKyAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdoZW4gTUFTTV9QUk9CRSAoYW5kIHRo ZXJlZm9yZSBERkcpIGFyZSBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suY3BwOgorICAgICAgICAqIGJ5 dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICBEaXNhYmxlIHNvbWUgY29kZSB3aGVuIGJ1aWxk aW5nIHdpdGhvdXQgREZHX0pJVC4KKwogMjAxNy0xMC0xMCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRp QGFwcGxlLmNvbT4KIAogICAgICAgICBUaGUgcHJvdG90eXBlIGNhY2hlIHNob3VsZCBiZSBhd2Fy ZSBvZiB0aGUgRXhlY3V0YWJsZSBpdCBnZW5lcmF0ZXMgYSBTdHJ1Y3R1cmUgZm9yCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDc1ZDFjMGFiZTQx YTEzMTgyNTNlM2UzYWFkZThkMDI0MmZjYjUyNWQuLjQyOGVhNjg4YTZhZTYyMjI1NDBlZGQ1ZDhh ZDQxNjMxYWI4NmY4NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Db2RlQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2Rl QmxvY2suY3BwCkBAIC0yMzIwLDYgKzIzMjAsNyBAQCBib29sIENvZGVCbG9jazo6Y2hlY2tJZk9w dGltaXphdGlvblRocmVzaG9sZFJlYWNoZWQoKQogICAgIHJldHVybiBtX2ppdEV4ZWN1dGVDb3Vu dGVyLmNoZWNrSWZUaHJlc2hvbGRDcm9zc2VkQW5kU2V0KHRoaXMpOwogfQogCisjaWYgRU5BQkxF KERGR19KSVQpCiBhdXRvIENvZGVCbG9jazo6dXBkYXRlT1NSRXhpdENvdW50ZXJBbmRDaGVja0lm TmVlZFRvUmVvcHRpbWl6ZShERkc6Ok9TUkV4aXRTdGF0ZSYgZXhpdFN0YXRlKSAtPiBPcHRpbWl6 ZUFjdGlvbgogewogICAgIERGRzo6T1NSRXhpdEJhc2UmIGV4aXQgPSBleGl0U3RhdGUuZXhpdDsK QEAgLTIzNjYsNiArMjM2Nyw3IEBAIGF1dG8gQ29kZUJsb2NrOjp1cGRhdGVPU1JFeGl0Q291bnRl ckFuZENoZWNrSWZOZWVkVG9SZW9wdGltaXplKERGRzo6T1NSRXhpdFN0YXRlCiAgICAgYmFzZWxp bmVDb2RlQmxvY2stPm1faml0RXhlY3V0ZUNvdW50ZXIuc2V0TmV3VGhyZXNob2xkRm9yT1NSRXhp dChleGl0U3RhdGUuYWN0aXZlVGhyZXNob2xkLCBleGl0U3RhdGUubWVtb3J5VXNhZ2VBZGp1c3Rl ZFRocmVzaG9sZCk7CiAgICAgcmV0dXJuIE9wdGltaXplQWN0aW9uOjpOb25lOwogfQorI2VuZGlm CiAKIHZvaWQgQ29kZUJsb2NrOjpvcHRpbWl6ZU5leHRJbnZvY2F0aW9uKCkKIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAppbmRleCBkZWNmOWM3YjY1ZWEzMDNm MWM3NzcwY2NlOWU0MTZhZGRiOWU1YzhhLi5lYTljYzAyNGJhY2M0YTBmMGEyMzgyNmJlMWUwNTMx ZjBjZWYyMzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5o CkBAIC03Nyw5ICs3NywxMSBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAorI2lmIEVOQUJMRShERkdf SklUKQogbmFtZXNwYWNlIERGRyB7CiBzdHJ1Y3QgT1NSRXhpdFN0YXRlOwogfSAvLyBuYW1lc3Bh Y2UgREZHCisjZW5kaWYKIAogY2xhc3MgQnl0ZWNvZGVMaXZlbmVzc0FuYWx5c2lzOwogY2xhc3Mg Q29kZUJsb2NrU2V0OwpAQCAtNzY3LDcgKzc2OSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGNvdW50 T1NSRXhpdCgpIHsgbV9vc3JFeGl0Q291bnRlcisrOyB9CiAKICAgICBlbnVtIGNsYXNzIE9wdGlt aXplQWN0aW9uIHsgTm9uZSwgUmVvcHRpbWl6ZU5vdyB9OworI2lmIEVOQUJMRShERkdfSklUKQog ICAgIE9wdGltaXplQWN0aW9uIHVwZGF0ZU9TUkV4aXRDb3VudGVyQW5kQ2hlY2tJZk5lZWRUb1Jl b3B0aW1pemUoREZHOjpPU1JFeGl0U3RhdGUmKTsKKyNlbmRpZgogCiAgICAgc3RhdGljIHB0cmRp ZmZfdCBvZmZzZXRPZk9TUkV4aXRDb3VudGVyKCkgeyByZXR1cm4gT0JKRUNUX09GRlNFVE9GKENv ZGVCbG9jaywgbV9vc3JFeGl0Q291bnRlcik7IH0KIAo=