145248 2015-05-21 02:13:30 -0700 Fix the !ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) build after r184337 2015-05-21 05:29:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143183 1 ossy ossy commit-queue oliver ysuzuki oldest_to_newest 1096528 0 ossy 2015-05-21 02:13:30 -0700 http://trac.webkit.org/changeset/184337 didn't add the necessary ifdef guards everywhere, so !ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) build is broken now and should be fixed. build log: ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h:506:60: error: 'TaggedTemplateNode' has not been declared ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2811:71: error: 'TaggedTemplateNode' has not been declared ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2816:5: error: 'TemplateStringListNode' was not declared in this scope ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2816:29: error: 'templateString' was not declared in this scope ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2816:62: error: request for member 'templateLiteral' in '* taggedTemplate', which is of non-class type 'int' ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2835:98: error: request for member 'divot' in '* taggedTemplate', which is of non-class type 'int' ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2835:123: error: request for member 'divotStart' in '* taggedTemplate', which is of non-class type 'int' ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2835:153: error: request for member 'divotEnd' in '* taggedTemplate', which is of non-class type 'int' ../../Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:2836:1: error: control reaches end of non-void function [-Werror=return-type] .... and a log failure in Parser.cpp 1096530 1 253511 ossy 2015-05-21 02:18:36 -0700 Created attachment 253511 Patch 1096536 2 253511 ysuzuki 2015-05-21 02:33:57 -0700 Comment on attachment 253511 Patch Built with -DENABLE_ES6_TEMPLATE_LITERAL_SYNTAX=OFF and the patch works. Thank you for your fix. 1096565 3 253511 commit-queue 2015-05-21 05:29:52 -0700 Comment on attachment 253511 Patch Clearing flags on attachment: 253511 Committed r184713: <http://trac.webkit.org/changeset/184713> 1096566 4 commit-queue 2015-05-21 05:29:55 -0700 All reviewed patches have been landed. Closing bug. 253511 2015-05-21 02:18:36 -0700 2015-05-21 05:29:52 -0700 Patch bug-145248-20150521021831.patch text/plain 3930 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 MDE4NmE2ZDg0Y2Q0MzhhOWEzY2M4NDg0NGI0OTZjN2I3YjZhNmNhLi5iZWE0YWYxMDI0OTFkZWM0 NDZjNWFmZjg4NjIyMjY5ZGI0OWJiYTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNS0wNS0yMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIEZpeCB0aGUgIUVOQUJMRShFUzZfVEVNUExBVEVfTElURVJBTF9TWU5U QVgpIGJ1aWxkIGFmdGVyIHIxODQzMzcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NTI0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcDoKKyAg ICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKiBwYXJz ZXIvUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVt YmVyRXhwcmVzc2lvbik6CisKIDIwMTUtMDUtMjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhcnJheSBwcmV2aWV3cyBzaG91 bGQgaGF2ZSBhIG11Y2ggc21hbGxlciBjYXAgb24gdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCmluZGV4 IDE0YTFlOTc0NDVkY2U0ZGM0OWVlMDZlYWYzYjFkZGRlYzFlZDNjZTMuLjQyNDU5ZjhkMWY1Nzg1 MzJiNDk0M2QxZGI2ZGNmYWFlNzA1Y2M1ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC0yODA4LDYg KzI4MDgsNyBAQCB2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RW51bWVyYXRpb24oVGhyb3dh YmxlRXhwcmVzc2lvbkRhdGEqIG5vZGUsIEV4cHJlc3NpbwogICAgIGVtaXRMYWJlbChsb29wRG9u ZS5nZXQoKSk7CiB9CiAKKyNpZiBFTkFCTEUoRVM2X1RFTVBMQVRFX0xJVEVSQUxfU1lOVEFYKQog UmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRHZXRUZW1wbGF0ZU9iamVjdChSZWdp c3RlcklEKiBkc3QsIFRhZ2dlZFRlbXBsYXRlTm9kZSogdGFnZ2VkVGVtcGxhdGUpCiB7CiAgICAg VGVtcGxhdGVSZWdpc3RyeUtleTo6U3RyaW5nVmVjdG9yIHJhd1N0cmluZ3M7CkBAIC0yODM0LDYg KzI4MzUsNyBAQCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEdldFRlbXBsYXRl T2JqZWN0KFJlZ2lzdGVySUQqIGRzdCwgVGFnZ2VkVGVtcAogICAgIGVtaXRMb2FkKGFyZ3VtZW50 cy50aGlzUmVnaXN0ZXIoKSwgSlNWYWx1ZShhZGRUZW1wbGF0ZVJlZ2lzdHJ5S2V5Q29uc3RhbnQo VGVtcGxhdGVSZWdpc3RyeUtleShyYXdTdHJpbmdzLCBjb29rZWRTdHJpbmdzKSkpKTsKICAgICBy ZXR1cm4gZW1pdENhbGwoZHN0LCBnZXRUZW1wbGF0ZU9iamVjdC5nZXQoKSwgTm9FeHBlY3RlZEZ1 bmN0aW9uLCBhcmd1bWVudHMsIHRhZ2dlZFRlbXBsYXRlLT5kaXZvdCgpLCB0YWdnZWRUZW1wbGF0 ZS0+ZGl2b3RTdGFydCgpLCB0YWdnZWRUZW1wbGF0ZS0+ZGl2b3RFbmQoKSk7CiB9CisjZW5kaWYK IAogUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRHZXRFbnVtZXJhYmxlTGVuZ3Ro KFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogYmFzZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAppbmRleCA0 NmY4ZTI1OGE5YjRkMzFmYzFlYjVkMTU3NDM5MzQzN2JmOTZkMmZkLi40MGE3YTdmNDc1YTcwNzE0 ZjE0ZjhhNWNlOWFiZThmOGU2YzNkNDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCkBAIC01MDMsOCArNTAzLDEx IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgUmVnaXN0ZXJJRCogdmFsdWVSZWdpc3Rl ciwgUmVnaXN0ZXJJRCogZ2V0dGVyUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIHNldHRlclJlZ2lzdGVy LCB1bnNpZ25lZCBvcHRpb25zLCBjb25zdCBKU1RleHRQb3NpdGlvbiYpOwogCiAgICAgICAgIHZv aWQgZW1pdEVudW1lcmF0aW9uKFRocm93YWJsZUV4cHJlc3Npb25EYXRhKiBlbnVtZXJhdGlvbk5v ZGUsIEV4cHJlc3Npb25Ob2RlKiBzdWJqZWN0Tm9kZSwgY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lk KEJ5dGVjb2RlR2VuZXJhdG9yJiwgUmVnaXN0ZXJJRCopPiYgY2FsbEJhY2spOworCisjaWYgRU5B QkxFKEVTNl9URU1QTEFURV9MSVRFUkFMX1NZTlRBWCkKICAgICAgICAgUmVnaXN0ZXJJRCogZW1p dEdldFRlbXBsYXRlT2JqZWN0KFJlZ2lzdGVySUQqIGRzdCwgVGFnZ2VkVGVtcGxhdGVOb2RlKik7 Ci0gICAgICAgIAorI2VuZGlmCisKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdFJldHVybihSZWdp c3RlcklEKiBzcmMpOwogICAgICAgICBSZWdpc3RlcklEKiBlbWl0RW5kKFJlZ2lzdGVySUQqIHNy YykgeyByZXR1cm4gZW1pdFVuYXJ5Tm9Ec3RPcChvcF9lbmQsIHNyYyk7IH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDlmYzlhMDZhY2UxYjlhOGUwMDA0OWNl MDc3ZDhlZmIzNGZlYzY0YzguLjYzYmQ0ZTA3MTAwMWE0YzQ4Y2I0MWFiNTE2ZTQ2ZDQ2MzU1YTk4 OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKQEAgLTI2MTEsNiAr MjYxMSw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4cHJlc3Npb24gUGFy c2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhwcmVzCiAgICAgICAgICAgICBuZXh0KCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorI2lmIEVOQUJMRShFUzZfVEVNUExBVEVfTElU RVJBTF9TWU5UQVgpCiAgICAgICAgIGNhc2UgVEVNUExBVEU6IHsKICAgICAgICAgICAgIHNlbWFu dGljRmFpbElmVHJ1ZShiYXNlSXNTdXBlciwgIkNhbm5vdCB1c2Ugc3VwZXIgYXMgdGFnIGZvciB0 YWdnZWQgdGVtcGxhdGVzIik7CiAgICAgICAgICAgICBKU1RleHRQb3NpdGlvbiBleHByZXNzaW9u RW5kID0gbGFzdFRva2VuRW5kUG9zaXRpb24oKTsKQEAgLTI2MjEsNiArMjYyMiw3IEBAIHRlbXBs YXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46 OnBhcnNlTWVtYmVyRXhwcmVzCiAgICAgICAgICAgICBtX25vbkxIU0NvdW50ID0gbm9uTEhTQ291 bnQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorI2VuZGlmCiAgICAgICAgIGRlZmF1 bHQ6CiAgICAgICAgICAgICBnb3RvIGVuZE1lbWJlckV4cHJlc3Npb247CiAgICAgICAgIH0K