90975 2012-07-11 05:07:09 -0700 jsc: Parse options before creating global data 2012-07-11 10:50:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 wingo wingo barraclough fpizlo mark.lam webkit.review.bot oldest_to_newest 666679 0 wingo 2012-07-11 05:07:09 -0700 This patch moves the options parsing in "jsc" before the creation of the global data, so that --useJIT=no takes effect. It also has a refactor (turning CommandLine into a class from a struct). I can undo that if it's not the thing to do. 666682 1 151689 wingo 2012-07-11 05:10:04 -0700 Created attachment 151689 Patch 666848 2 mark.lam 2012-07-11 10:23:36 -0700 I don't have review privileges, but the change looks good to me. 666869 3 151689 webkit.review.bot 2012-07-11 10:50:33 -0700 Comment on attachment 151689 Patch Clearing flags on attachment: 151689 Committed r122341: <http://trac.webkit.org/changeset/122341> 666870 4 webkit.review.bot 2012-07-11 10:50:38 -0700 All reviewed patches have been landed. Closing bug. 151689 2012-07-11 05:10:04 -0700 2012-07-11 10:50:33 -0700 Patch bug-90975-20120711141003.patch text/plain 5356 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MWNiZWZhMzY5ZGIyNDBjNWEyZDk4ZGQwZDYxYWMyZjBjMTUyMGZhLi5jYjRlZmU2ZjE0ZmY2Y2E4 NjM5Y2MzZjIxNmU1M2EzYzM1NWY1YzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0wNy0xMSAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CisK KyAgICAgICAganNjOiBQYXJzZSBvcHRpb25zIGJlZm9yZSBjcmVhdGluZyBnbG9iYWwgZGF0YQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA5NzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IG1vdmVzIHRoZSBvcHRpb25zIHBhcnNpbmcgaW4gImpzYyIgYmVmb3JlIHRoZSBjcmVhdGlvbgor ICAgICAgICBvZiB0aGUgSlNHbG9iYWxEYXRhLCBzbyB0aGF0IC0tdXNlSklUPW5vIGhhcyBhIGNo YW5jZSB0byB0YWtlCisgICAgICAgIGVmZmVjdC4KKworICAgICAgICAqIGpzYy5jcHA6CisgICAg ICAgIChDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMpOiBSZWZhY3RvciB0byBiZSBhIGNsYXNz LCBhbmQgdGFrZQorICAgICAgICBhcmdjIGFuZCBhcmd2IGFzIGNvbnN0cnVjdG9yIGFyZ3VtZW50 cy4KKyAgICAgICAgKGpzY21haW4pOiBNb3ZlIGFyZyBwYXJzaW5nIGJlZm9yZSBKU0dsb2JhbERh dGEgY3JlYXRpb24uCisKIDIwMTItMDctMTAgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMjIxNjYpOiBJdCBtYWRlIDE3MCB0ZXN0cyBjcmFz aCBvbiAzMiBiaXQgcGxhdGZvcm1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv anNjLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCmluZGV4IDQzMzM3ZTRlZWRl MDg1NWIxY2ZlZTQ0MDdjM2RjYzgwOGMxMjFlZTUuLjVmM2RiZGI5OTY3M2M4YWMxN2ZjMzgwNDYz NGIwNWUzMDU0YjIyMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCkBAIC0xMTMsMTkgKzExMywyMyBA QCBzdHJ1Y3QgU2NyaXB0IHsKICAgICB9CiB9OwogCi1zdHJ1Y3QgQ29tbWFuZExpbmUgewotICAg IENvbW1hbmRMaW5lKCkKLSAgICAgICAgOiBpbnRlcmFjdGl2ZShmYWxzZSkKLSAgICAgICAgLCBk dW1wKGZhbHNlKQotICAgICAgICAsIGV4aXRDb2RlKGZhbHNlKQorY2xhc3MgQ29tbWFuZExpbmUg eworcHVibGljOgorICAgIENvbW1hbmRMaW5lKGludCBhcmdjLCBjaGFyKiogYXJndikKKyAgICAg ICAgOiBtX2ludGVyYWN0aXZlKGZhbHNlKQorICAgICAgICAsIG1fZHVtcChmYWxzZSkKKyAgICAg ICAgLCBtX2V4aXRDb2RlKGZhbHNlKQogICAgIHsKKyAgICAgICAgcGFyc2VBcmd1bWVudHMoYXJn YywgYXJndik7CiAgICAgfQogCi0gICAgYm9vbCBpbnRlcmFjdGl2ZTsKLSAgICBib29sIGR1bXA7 Ci0gICAgYm9vbCBleGl0Q29kZTsKLSAgICBWZWN0b3I8U2NyaXB0PiBzY3JpcHRzOwotICAgIFZl Y3RvcjxVU3RyaW5nPiBhcmd1bWVudHM7CisgICAgYm9vbCBtX2ludGVyYWN0aXZlOworICAgIGJv b2wgbV9kdW1wOworICAgIGJvb2wgbV9leGl0Q29kZTsKKyAgICBWZWN0b3I8U2NyaXB0PiBtX3Nj cmlwdHM7CisgICAgVmVjdG9yPFVTdHJpbmc+IG1fYXJndW1lbnRzOworCisgICAgdm9pZCBwYXJz ZUFyZ3VtZW50cyhpbnQsIGNoYXIqKik7CiB9OwogCiBzdGF0aWMgY29uc3QgY2hhciBpbnRlcmFj dGl2ZVByb21wdFtdID0gIj4gIjsKQEAgLTYyMyw3ICs2MjcsNyBAQCBzdGF0aWMgTk9fUkVUVVJO IHZvaWQgcHJpbnRVc2FnZVN0YXRlbWVudChib29sIGhlbHAgPSBmYWxzZSkKICAgICBleGl0KGhl bHAgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkUpOwogfQogCi1zdGF0aWMgdm9pZCBwYXJz ZUFyZ3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFyZ3YsIENvbW1hbmRMaW5lJiBvcHRpb25zKQor dm9pZCBDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMoaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQog ewogICAgIGludCBpID0gMTsKICAgICBib29sIG5lZWRUb0R1bXBPcHRpb25zID0gZmFsc2U7CkBA IC02MzQsMjEgKzYzOCwyMSBAQCBzdGF0aWMgdm9pZCBwYXJzZUFyZ3VtZW50cyhpbnQgYXJnYywg Y2hhcioqIGFyZ3YsIENvbW1hbmRMaW5lJiBvcHRpb25zKQogICAgICAgICBpZiAoIXN0cmNtcChh cmcsICItZiIpKSB7CiAgICAgICAgICAgICBpZiAoKytpID09IGFyZ2MpCiAgICAgICAgICAgICAg ICAgcHJpbnRVc2FnZVN0YXRlbWVudCgpOwotICAgICAgICAgICAgb3B0aW9ucy5zY3JpcHRzLmFw cGVuZChTY3JpcHQodHJ1ZSwgYXJndltpXSkpOworICAgICAgICAgICAgbV9zY3JpcHRzLmFwcGVu ZChTY3JpcHQodHJ1ZSwgYXJndltpXSkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg IH0KICAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAiLWUiKSkgewogICAgICAgICAgICAgaWYgKCsr aSA9PSBhcmdjKQogICAgICAgICAgICAgICAgIHByaW50VXNhZ2VTdGF0ZW1lbnQoKTsKLSAgICAg ICAgICAgIG9wdGlvbnMuc2NyaXB0cy5hcHBlbmQoU2NyaXB0KGZhbHNlLCBhcmd2W2ldKSk7Cisg ICAgICAgICAgICBtX3NjcmlwdHMuYXBwZW5kKFNjcmlwdChmYWxzZSwgYXJndltpXSkpOwogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAi LWkiKSkgewotICAgICAgICAgICAgb3B0aW9ucy5pbnRlcmFjdGl2ZSA9IHRydWU7CisgICAgICAg ICAgICBtX2ludGVyYWN0aXZlID0gdHJ1ZTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICB9CiAgICAgICAgIGlmICghc3RyY21wKGFyZywgIi1kIikpIHsKLSAgICAgICAgICAgIG9wdGlv bnMuZHVtcCA9IHRydWU7CisgICAgICAgICAgICBtX2R1bXAgPSB0cnVlOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAiLXMiKSkgewpA QCAtNjYxLDcgKzY2NSw3IEBAIHN0YXRpYyB2b2lkIHBhcnNlQXJndW1lbnRzKGludCBhcmdjLCBj aGFyKiogYXJndiwgQ29tbWFuZExpbmUmIG9wdGlvbnMpCiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogICAgICAgICBpZiAoIXN0cmNtcChhcmcsICIteCIpKSB7Ci0gICAgICAgICAg ICBvcHRpb25zLmV4aXRDb2RlID0gdHJ1ZTsKKyAgICAgICAgICAgIG1fZXhpdENvZGUgPSB0cnVl OwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFzdHJjbXAo YXJnLCAiLS0iKSkgewpAQCAtNjkwLDE0ICs2OTQsMTQgQEAgc3RhdGljIHZvaWQgcGFyc2VBcmd1 bWVudHMoaW50IGFyZ2MsIGNoYXIqKiBhcmd2LCBDb21tYW5kTGluZSYgb3B0aW9ucykKIAogICAg ICAgICAvLyBUaGlzIGFyZyBpcyBub3QgcmVjb2duaXplZCBieSB0aGUgVk0gbm9yIGJ5IGpzYy4g UGFzcyBpdCBvbiB0byB0aGUKICAgICAgICAgLy8gc2NyaXB0LgotICAgICAgICBvcHRpb25zLnNj cmlwdHMuYXBwZW5kKFNjcmlwdCh0cnVlLCBhcmd2W2ldKSk7CisgICAgICAgIG1fc2NyaXB0cy5h cHBlbmQoU2NyaXB0KHRydWUsIGFyZ3ZbaV0pKTsKICAgICB9CiAKLSAgICBpZiAob3B0aW9ucy5z Y3JpcHRzLmlzRW1wdHkoKSkKLSAgICAgICAgb3B0aW9ucy5pbnRlcmFjdGl2ZSA9IHRydWU7Cisg ICAgaWYgKG1fc2NyaXB0cy5pc0VtcHR5KCkpCisgICAgICAgIG1faW50ZXJhY3RpdmUgPSB0cnVl OwogCiAgICAgZm9yICg7IGkgPCBhcmdjOyArK2kpCi0gICAgICAgIG9wdGlvbnMuYXJndW1lbnRz LmFwcGVuZChhcmd2W2ldKTsKKyAgICAgICAgbV9hcmd1bWVudHMuYXBwZW5kKGFyZ3ZbaV0pOwog CiAgICAgaWYgKG5lZWRUb0R1bXBPcHRpb25zKQogICAgICAgICBKU0M6Ok9wdGlvbnM6OmR1bXBB bGxPcHRpb25zKHN0ZGVycik7CkBAIC03MDcsMjEgKzcxMSwyMSBAQCBzdGF0aWMgdm9pZCBwYXJz ZUFyZ3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFyZ3YsIENvbW1hbmRMaW5lJiBvcHRpb25zKQog CiBpbnQganNjbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiB7CisgICAgLy8gTm90ZSB0aGF0 IHRoZSBvcHRpb25zIHBhcnNpbmcgY2FuIGFmZmVjdCBKU0dsb2JhbERhdGEgY3JlYXRpb24sIGFu ZCB0aHVzCisgICAgLy8gY29tZXMgZmlyc3QuCisgICAgQ29tbWFuZExpbmUgb3B0aW9ucyhhcmdj LCBhcmd2KTsKICAgICBSZWZQdHI8SlNHbG9iYWxEYXRhPiBnbG9iYWxEYXRhID0gSlNHbG9iYWxE YXRhOjpjcmVhdGUoVGhyZWFkU3RhY2tUeXBlTGFyZ2UsIExhcmdlSGVhcCk7CiAgICAgSlNMb2Nr SG9sZGVyIGxvY2soZ2xvYmFsRGF0YS5nZXQoKSk7CiAgICAgaW50IHJlc3VsdDsKIAotICAgIENv bW1hbmRMaW5lIG9wdGlvbnM7Ci0gICAgcGFyc2VBcmd1bWVudHMoYXJnYywgYXJndiwgb3B0aW9u cyk7Ci0KLSAgICBHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IEdsb2JhbE9iamVjdDo6Y3Jl YXRlKCpnbG9iYWxEYXRhLCBHbG9iYWxPYmplY3Q6OmNyZWF0ZVN0cnVjdHVyZSgqZ2xvYmFsRGF0 YSwganNOdWxsKCkpLCBvcHRpb25zLmFyZ3VtZW50cyk7Ci0gICAgYm9vbCBzdWNjZXNzID0gcnVu V2l0aFNjcmlwdHMoZ2xvYmFsT2JqZWN0LCBvcHRpb25zLnNjcmlwdHMsIG9wdGlvbnMuZHVtcCk7 Ci0gICAgaWYgKG9wdGlvbnMuaW50ZXJhY3RpdmUgJiYgc3VjY2VzcykKKyAgICBHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCA9IEdsb2JhbE9iamVjdDo6Y3JlYXRlKCpnbG9iYWxEYXRhLCBHbG9i YWxPYmplY3Q6OmNyZWF0ZVN0cnVjdHVyZSgqZ2xvYmFsRGF0YSwganNOdWxsKCkpLCBvcHRpb25z Lm1fYXJndW1lbnRzKTsKKyAgICBib29sIHN1Y2Nlc3MgPSBydW5XaXRoU2NyaXB0cyhnbG9iYWxP YmplY3QsIG9wdGlvbnMubV9zY3JpcHRzLCBvcHRpb25zLm1fZHVtcCk7CisgICAgaWYgKG9wdGlv bnMubV9pbnRlcmFjdGl2ZSAmJiBzdWNjZXNzKQogICAgICAgICBydW5JbnRlcmFjdGl2ZShnbG9i YWxPYmplY3QpOwogCiAgICAgcmVzdWx0ID0gc3VjY2VzcyA/IDAgOiAzOwogCi0gICAgaWYgKG9w dGlvbnMuZXhpdENvZGUpCisgICAgaWYgKG9wdGlvbnMubV9leGl0Q29kZSkKICAgICAgICAgcHJp bnRmKCJqc2MgZXhpdGluZyAlZFxuIiwgcmVzdWx0KTsKIAogICAgIHJldHVybiByZXN1bHQ7Cg==