152549 2015-12-24 12:50:14 -0800 Add validation of JSC options to catch typos. 2016-01-05 14:06:06 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152751 1 mark.lam mark.lam benjamin commit-queue fpizlo ggaren keith_miller msaboff ossy saam oldest_to_newest 1151288 0 mark.lam 2015-12-24 12:50:14 -0800 Patch coming. 1151291 1 267904 mark.lam 2015-12-24 12:59:17 -0800 Created attachment 267904 proposed patch. 1152387 2 267904 ggaren 2016-01-04 10:58:04 -0800 Comment on attachment 267904 proposed patch. Let's make validation the default behavior rather than an option. Having to type in an option in order to validate your options begs the original question of typing options correctly. 1152403 3 fpizlo 2016-01-04 11:16:20 -0800 (In reply to comment #2) > Comment on attachment 267904 [details] > proposed patch. > > Let's make validation the default behavior rather than an option. Having to > type in an option in order to validate your options begs the original > question of typing options correctly. There were arguments against doing this when we discussed this last. I said that I didn't want this because I was worried about end users seeing crashes just because "JSC_" ended up at the start of some environment variable. Michael said that he didn't want this because it would break his lldb workflow. 1152416 4 keith_miller 2016-01-04 11:29:25 -0800 (In reply to comment #3) > (In reply to comment #2) > > Comment on attachment 267904 [details] > > proposed patch. > > > > Let's make validation the default behavior rather than an option. Having to > > type in an option in order to validate your options begs the original > > question of typing options correctly. > > There were arguments against doing this when we discussed this last. > > I said that I didn't want this because I was worried about end users seeing > crashes just because "JSC_" ended up at the start of some environment > variable. > > Michael said that he didn't want this because it would break his lldb > workflow. I disagree that Michael's issue is a valid argument against setting validate as the default as it's trivial to export JSC_validateOptions=false. It's also trivial to export JSC_validateOptions=true, however, so I'm not sure it's necessary to have validation as the default either. I agree with the first argument, although I think it should be noted that the crashes only really realistically be an issue with command line users of JSC. However, I still think that any frustration for end users is enough of an issue that we should not make validation the default. 1152523 5 267904 ggaren 2016-01-04 14:49:22 -0800 Comment on attachment 267904 proposed patch. I just now read the email discussion of this feature. It wasn't mentioned in this patch, so I didn't think to look. I guess I have to remove my review since it was based on incomplete information. Based on the email discussion, it seems like there's consensus that it's valuable to log incorrect options as a warning, and also consensus that it is harmful to crash. Also, as I said above, adding an option to validate options begs the original question. So, now I think we should always log, and never crash. What's the affirmative reason to crash? A portion of the email discussion revealed that we have caused problems by just letting folks do what they feel in this area of code, without strict review, so I am applying stricter review now. 1152539 6 mark.lam 2016-01-04 15:20:11 -0800 (In reply to comment #5) > Comment on attachment 267904 [details] > proposed patch. > > I just now read the email discussion of this feature. It wasn't mentioned in > this patch, so I didn't think to look. I guess I have to remove my review > since it was based on incomplete information. > > Based on the email discussion, it seems like there's consensus that it's > valuable to log incorrect options as a warning, and also consensus that it > is harmful to crash. Also, as I said above, adding an option to validate > options begs the original question. > > So, now I think we should always log, and never crash. > > What's the affirmative reason to crash? > > A portion of the email discussion revealed that we have caused problems by > just letting folks do what they feel in this area of code, without strict > review, so I am applying stricter review now. This patch already always logs the bad options. The reason for wanting a mode that allows crashing is because logging will not always get one's attention. Logging is not always readily available either. For example, on iOS, I will have to remember to redirect dataLog and read the dataLog file for the error message in order to notice this. Granted, there's is still a chance that one can have a typo when setting JSC_validateOptions, but it is much easier to get that right then to have to get all the other options right, especially when those options are the ones we will change from time to time depending on benchmarking / debugging needs. Here's a use case scenario that will save me from losing a day's work (or more) due to potential typo in options that I need to set and change in the course of debugging hard bugs: 1. In my .profile file, I add an environment var JSC_validateOptions=true. 2. I do debugging like normal. Note that I only need to check that there's no typo in my .profile change just once. Once I've set it correctly in my shell profile, I never have to worry about typos in options again. For those whose workflows prefer checking their typing every time, they can look for the logging output. For my type of workflow where I prefer to have change options depending on what the data tells me in the course of debugging, it's better to have a hard failure when I'm not using the options I expected. 1152742 7 saam 2016-01-05 09:49:28 -0800 (In reply to comment #6) > (In reply to comment #5) > > Comment on attachment 267904 [details] > > proposed patch. > > > > I just now read the email discussion of this feature. It wasn't mentioned in > > this patch, so I didn't think to look. I guess I have to remove my review > > since it was based on incomplete information. > > > > Based on the email discussion, it seems like there's consensus that it's > > valuable to log incorrect options as a warning, and also consensus that it > > is harmful to crash. Also, as I said above, adding an option to validate > > options begs the original question. > > > > So, now I think we should always log, and never crash. > > > > What's the affirmative reason to crash? > > > > A portion of the email discussion revealed that we have caused problems by > > just letting folks do what they feel in this area of code, without strict > > review, so I am applying stricter review now. > > This patch already always logs the bad options. The reason for wanting a > mode that allows crashing is because logging will not always get one's > attention. Logging is not always readily available either. For example, on > iOS, I will have to remember to redirect dataLog and read the dataLog file > for the error message in order to notice this. > > Granted, there's is still a chance that one can have a typo when setting > JSC_validateOptions, but it is much easier to get that right then to have to > get all the other options right, especially when those options are the ones > we will change from time to time depending on benchmarking / debugging needs. > > Here's a use case scenario that will save me from losing a day's work (or > more) due to potential typo in options that I need to set and change in the > course of debugging hard bugs: > > 1. In my .profile file, I add an environment var JSC_validateOptions=true. > 2. I do debugging like normal. > > Note that I only need to check that there's no typo in my .profile change > just once. Once I've set it correctly in my shell profile, I never have to > worry about typos in options again. > > For those whose workflows prefer checking their typing every time, they can > look for the logging output. For my type of workflow where I prefer to have > change options depending on what the data tells me in the course of > debugging, it's better to have a hard failure when I'm not using the options > I expected. I agree with this argument. When I'm debugging JSC, I always want a crash if I mistype an option. I think it's also totally fine to have this behavior with the option being off by default. Or, if we really want to get fancy, we could log mistyped options by default and only crash when another option is set (maybe JSC_validateOptionsWithCrash) that is off by default. 1152763 8 mark.lam 2016-01-05 11:04:07 -0800 Thanks for the review. Landed in r194590: <http://trac.webkit.org/r194590>. 1152826 9 commit-queue 2016-01-05 12:36:39 -0800 Re-opened since this is blocked by bug 152751 1152874 10 268320 mark.lam 2016-01-05 13:50:51 -0800 Created attachment 268320 proposed patch for re-landing: no longer restricting where we put -- options on the command line. 1152879 11 mark.lam 2016-01-05 14:06:06 -0800 Thanks for the review. The revised patch has been landed in r194606: <http://trac.webkit.org/r194606>. 267904 2015-12-24 12:59:17 -0800 2016-01-05 13:50:51 -0800 proposed patch. bug-152549.patch text/plain 8663 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NDE2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE1LTEyLTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgdmFsaWRhdGlvbiBvZiBKU0Mgb3B0aW9ucyB0byBjYXRjaCB0eXBvcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjU0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIElmIGEgSlNDX3h4eCBvcHRp b24gaXMgZm91bmQgYW5kIHh4eCBpcyBub3QgYSB2YWxpZCBvcHRpb24sIHdlIHdpbGwgbm93IGxv ZworICAgICAgICAgICBhbiBlcnJvciBtZXNzYWdlLgorICAgICAgICAyLiBUaGUganNjIGFwcCBp cyBjb21tb25seSB1c2VkIGFzIGZvbGxvd3M6CisKKyAgICAgICAgICAgICAgICQganNjIFtqc2Mg b3B0aW9uc10gW3NjcmlwdHNdCisgICAgIAorICAgICAgICAgICBQcmV2aW91c2x5LCB3ZSdsbCBj b250aW51ZSB0byBwYXJzZSBmb3IgW2pzYyBvcHRpb25zXSBhZnRlciBbc2NyaXB0c10gaXMgc2Vl bi4KKyAgICAgICAgICAgV2Ugd29uJ3QgZG8gdGhpcyBhbnltb3JlLiAgQW55IC0teHh4IGpzYyBv cHRpb25zIG11c3QgcHJlY2VkZSB0aGUgW3NjcmlwdHNdCisgICAgICAgICAgIGFyZ3VtZW50cy4K KworICAgICAgICAzLiBJZiBhIC0teHh4IGpzYyBvcHRpb24gaXMgc3BlY2lmaWVkLCBidXQgeHh4 IGlzIG5vdCBhIHZhbGlkIG9wdGlvbiwgd2Ugd2lsbAorICAgICAgICAgICBub3cgbG9nIGFuIGVy cm9yIG1lc3NhZ2UuCisKKyAgICAgICAgNC4gQWRkZWQgSlNDX3ZhbGlkYXRlT3B0aW9ucywgd2hp Y2ggaWYgc2V0IHRvIHRydWUgd2lsbCBjYXVzZSB0aGUgVk0gdG8gY3Jhc2ggaWYKKyAgICAgICAg ICAgYW4gaW52YWxpZCBvcHRpb24gd2FzIHNlZW4gZHVyaW5nIG9wdGlvbnMgcGFyc2luZy4KKwor ICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMp OgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5jcHA6CisgICAgICAgIChKU0M6Ok9wdGlvbnM6 OmluaXRpYWxpemUpOgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorCiAyMDE1LTEyLTIz ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBqc2MgQ0xJIHRv b2wgY3Jhc2hlcyBvbiBFT0YuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMTk0 NDE1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE4ODksODAgKzE4ODksOTQgQEAgdm9pZCBDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMoaW50 IGFyZwogICAgIGJvb2wgbmVlZFRvRHVtcE9wdGlvbnMgPSBmYWxzZTsKICAgICBib29sIG5lZWRU b0V4aXQgPSBmYWxzZTsKIAorICAgIGJvb2wgZG9uZVdpdGhKU0NPcHRpb25zID0gZmFsc2U7Cisg ICAgYm9vbCBoYXNCYWRKU0NPcHRpb25zID0gZmFsc2U7CiAgICAgZm9yICg7IGkgPCBhcmdjOyAr K2kpIHsKICAgICAgICAgY29uc3QgY2hhciogYXJnID0gYXJndltpXTsKLSAgICAgICAgaWYgKCFz dHJjbXAoYXJnLCAiLWYiKSkgewotICAgICAgICAgICAgaWYgKCsraSA9PSBhcmdjKQotICAgICAg ICAgICAgICAgIHByaW50VXNhZ2VTdGF0ZW1lbnQoKTsKLSAgICAgICAgICAgIG1fc2NyaXB0cy5h cHBlbmQoU2NyaXB0KHRydWUsIGFyZ3ZbaV0pKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICB9Ci0gICAgICAgIGlmICghc3RyY21wKGFyZywgIi1lIikpIHsKLSAgICAgICAgICAgIGlm ICgrK2kgPT0gYXJnYykKLSAgICAgICAgICAgICAgICBwcmludFVzYWdlU3RhdGVtZW50KCk7Ci0g ICAgICAgICAgICBtX3NjcmlwdHMuYXBwZW5kKFNjcmlwdChmYWxzZSwgYXJndltpXSkpOwotICAg ICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAi LWkiKSkgewotICAgICAgICAgICAgbV9pbnRlcmFjdGl2ZSA9IHRydWU7Ci0gICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAoIXN0cmNtcChhcmcsICItZCIpKSB7Ci0g ICAgICAgICAgICBtX2R1bXAgPSB0cnVlOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAg IH0KLSAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAiLXAiKSkgewotICAgICAgICAgICAgaWYgKCsr aSA9PSBhcmdjKQotICAgICAgICAgICAgICAgIHByaW50VXNhZ2VTdGF0ZW1lbnQoKTsKLSAgICAg ICAgICAgIG1fcHJvZmlsZSA9IHRydWU7Ci0gICAgICAgICAgICBtX3Byb2ZpbGVyT3V0cHV0ID0g YXJndltpXTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmICgh c3RyY21wKGFyZywgIi1tIikpIHsKLSAgICAgICAgICAgIG1fbW9kdWxlID0gdHJ1ZTsKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmICghc3RyY21wKGFyZywgIi1z IikpIHsKKworICAgICAgICBpZiAoIWRvbmVXaXRoSlNDT3B0aW9ucykgeworICAgICAgICAgICAg aWYgKCFzdHJjbXAoYXJnLCAiLWYiKSkgeworICAgICAgICAgICAgICAgIGlmICgrK2kgPT0gYXJn YykKKyAgICAgICAgICAgICAgICAgICAgcHJpbnRVc2FnZVN0YXRlbWVudCgpOworICAgICAgICAg ICAgICAgIG1fc2NyaXB0cy5hcHBlbmQoU2NyaXB0KHRydWUsIGFyZ3ZbaV0pKTsKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICghc3RyY21w KGFyZywgIi1lIikpIHsKKyAgICAgICAgICAgICAgICBpZiAoKytpID09IGFyZ2MpCisgICAgICAg ICAgICAgICAgICAgIHByaW50VXNhZ2VTdGF0ZW1lbnQoKTsKKyAgICAgICAgICAgICAgICBtX3Nj cmlwdHMuYXBwZW5kKFNjcmlwdChmYWxzZSwgYXJndltpXSkpOworICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAiLWki KSkgeworICAgICAgICAgICAgICAgIG1faW50ZXJhY3RpdmUgPSB0cnVlOworICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFzdHJjbXAoYXJn LCAiLWQiKSkgeworICAgICAgICAgICAgICAgIG1fZHVtcCA9IHRydWU7CisgICAgICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIXN0cmNtcChhcmcs ICItcCIpKSB7CisgICAgICAgICAgICAgICAgaWYgKCsraSA9PSBhcmdjKQorICAgICAgICAgICAg ICAgICAgICBwcmludFVzYWdlU3RhdGVtZW50KCk7CisgICAgICAgICAgICAgICAgbV9wcm9maWxl ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBtX3Byb2ZpbGVyT3V0cHV0ID0gYXJndltpXTsKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICgh c3RyY21wKGFyZywgIi1tIikpIHsKKyAgICAgICAgICAgICAgICBtX21vZHVsZSA9IHRydWU7Cisg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAo IXN0cmNtcChhcmcsICItcyIpKSB7CiAjaWYgSEFWRShTSUdOQUxfSCkKLSAgICAgICAgICAgIHNp Z25hbChTSUdJTEwsIF9leGl0KTsKLSAgICAgICAgICAgIHNpZ25hbChTSUdGUEUsIF9leGl0KTsK LSAgICAgICAgICAgIHNpZ25hbChTSUdCVVMsIF9leGl0KTsKLSAgICAgICAgICAgIHNpZ25hbChT SUdTRUdWLCBfZXhpdCk7CisgICAgICAgICAgICAgICAgc2lnbmFsKFNJR0lMTCwgX2V4aXQpOwor ICAgICAgICAgICAgICAgIHNpZ25hbChTSUdGUEUsIF9leGl0KTsKKyAgICAgICAgICAgICAgICBz aWduYWwoU0lHQlVTLCBfZXhpdCk7CisgICAgICAgICAgICAgICAgc2lnbmFsKFNJR1NFR1YsIF9l eGl0KTsKICNlbmRpZgotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAg aWYgKCFzdHJjbXAoYXJnLCAiLXgiKSkgewotICAgICAgICAgICAgbV9leGl0Q29kZSA9IHRydWU7 Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAoIXN0cmNtcChh cmcsICItLSIpKSB7Ci0gICAgICAgICAgICArK2k7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAg ICAgfQotICAgICAgICBpZiAoIXN0cmNtcChhcmcsICItaCIpIHx8ICFzdHJjbXAoYXJnLCAiLS1o ZWxwIikpCi0gICAgICAgICAgICBwcmludFVzYWdlU3RhdGVtZW50KHRydWUpOworICAgICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFzdHJjbXAo YXJnLCAiLXgiKSkgeworICAgICAgICAgICAgICAgIG1fZXhpdENvZGUgPSB0cnVlOworICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFzdHJj bXAoYXJnLCAiLS0iKSkgeworICAgICAgICAgICAgICAgICsraTsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICghc3RyY21wKGFyZywgIi1oIikg fHwgIXN0cmNtcChhcmcsICItLWhlbHAiKSkKKyAgICAgICAgICAgICAgICBwcmludFVzYWdlU3Rh dGVtZW50KHRydWUpOworCisgICAgICAgICAgICBpZiAoIXN0cmNtcChhcmcsICItLW9wdGlvbnMi KSkgeworICAgICAgICAgICAgICAgIG5lZWRUb0R1bXBPcHRpb25zID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICBuZWVkVG9FeGl0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICghc3RyY21wKGFyZywgIi0tZHVtcE9wdGlvbnMi KSkgeworICAgICAgICAgICAgICAgIG5lZWRUb0R1bXBPcHRpb25zID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8gU2VlIGlm IHRoZSAtLSBvcHRpb24gaXMgYSBKU0MgVk0gb3B0aW9uLgorICAgICAgICAgICAgaWYgKHN0cnN0 cihhcmcsICItLSIpID09IGFyZykgeworICAgICAgICAgICAgICAgIGlmICghSlNDOjpPcHRpb25z OjpzZXRPcHRpb24oJmFyZ1syXSkpIHsKKyAgICAgICAgICAgICAgICAgICAgaGFzQmFkSlNDT3B0 aW9ucyA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGRhdGFMb2coIkVSUk9SOiBpbnZhbGlk IG9wdGlvbjogIiwgYXJnLCAiXG4iKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAi LS1vcHRpb25zIikpIHsKLSAgICAgICAgICAgIG5lZWRUb0R1bXBPcHRpb25zID0gdHJ1ZTsKLSAg ICAgICAgICAgIG5lZWRUb0V4aXQgPSB0cnVlOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgIH0KLSAgICAgICAgaWYgKCFzdHJjbXAoYXJnLCAiLS1kdW1wT3B0aW9ucyIpKSB7Ci0gICAg ICAgICAgICBuZWVkVG9EdW1wT3B0aW9ucyA9IHRydWU7Ci0gICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgfQorICAgICAgICAgICAgZG9uZVdpdGhKU0NPcHRpb25zID0gdHJ1ZTsKIAotICAg ICAgICAvLyBTZWUgaWYgdGhlIC0tIG9wdGlvbiBpcyBhIEpTQyBWTSBvcHRpb24uCi0gICAgICAg IGlmIChzdHJzdHIoYXJnLCAiLS0iKSA9PSBhcmcgJiYgSlNDOjpPcHRpb25zOjpzZXRPcHRpb24o JmFyZ1syXSkpIHsKLSAgICAgICAgICAgIC8vIFRoZSBhcmcgd2FzIHJlY29nbml6ZWQgYXMgYSBW TSBvcHRpb24gYW5kIGhhcyBiZWVuIHBhcnNlZC4KLSAgICAgICAgICAgIGNvbnRpbnVlOyAvLyBK dXN0IGNvbnRpbnVlIHdpdGggdGhlIG5leHQgYXJnLiAKLSAgICAgICAgfQorICAgICAgICB9IC8v ICFkb25lV2l0aEpTQ09wdGlvbnMKIAogICAgICAgICAvLyBUaGlzIGFyZyBpcyBub3QgcmVjb2du aXplZCBieSB0aGUgVk0gbm9yIGJ5IGpzYy4gUGFzcyBpdCBvbiB0byB0aGUKICAgICAgICAgLy8g c2NyaXB0LgogICAgICAgICBtX3NjcmlwdHMuYXBwZW5kKFNjcmlwdCh0cnVlLCBhcmd2W2ldKSk7 CiAgICAgfQogCisgICAgaWYgKGhhc0JhZEpTQ09wdGlvbnMgJiYgSlNDOjpPcHRpb25zOjp2YWxp ZGF0ZU9wdGlvbnMoKSkKKyAgICAgICAgQ1JBU0goKTsKKwogICAgIGlmIChtX3NjcmlwdHMuaXNF bXB0eSgpKQogICAgICAgICBtX2ludGVyYWN0aXZlID0gdHJ1ZTsKIApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHJldmlzaW9uIDE5NDQxNSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zOSw2ICszOSwxMCBAQAogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNs dWRlIDxjcnRfZXh0ZXJucy5oPgorI2VuZGlmCisKICNpZiBPUyhXSU5ET1dTKQogI2luY2x1ZGUg Ik1hY3JvQXNzZW1ibGVyWDg2LmgiCiAjZW5kaWYKQEAgLTM2MSwxMCArMzY1LDI1IEBAIHZvaWQg T3B0aW9uczo6aW5pdGlhbGl6ZSgpCiAgICAgICAgICAgICAvLyBBbGxvdyBlbnZpcm9ubWVudCB2 YXJzIHRvIG92ZXJyaWRlIG9wdGlvbnMgaWYgYXBwbGljYWJsZS4KICAgICAgICAgICAgIC8vIFRo ZSBldm4gdmFyIHNob3VsZCBiZSB0aGUgbmFtZSBvZiB0aGUgb3B0aW9uIHByZWZpeGVkIHdpdGgK ICAgICAgICAgICAgIC8vICJKU0NfIi4KKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICAgICAgICAg IGJvb2wgaGFzQmFkT3B0aW9ucyA9IGZhbHNlOworICAgICAgICAgICAgZm9yIChjaGFyKiogZW52 cCA9ICpfTlNHZXRFbnZpcm9uKCk7ICplbnZwOyBlbnZwKyspIHsKKyAgICAgICAgICAgICAgICBj b25zdCBjaGFyKiBlbnYgPSAqZW52cDsKKyAgICAgICAgICAgICAgICBpZiAoIXN0cm5jbXAoIkpT Q18iLCBlbnYsIDQpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmICghT3B0aW9uczo6c2V0T3B0 aW9uKCZlbnZbNF0pKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nKCJFUlJPUjog aW52YWxpZCBvcHRpb246ICIsICplbnZwLCAiXG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGhhc0JhZE9wdGlvbnMgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGhhc0JhZE9wdGlvbnMgJiYg T3B0aW9uczo6dmFsaWRhdGVPcHRpb25zKCkpCisgICAgICAgICAgICAgICAgQ1JBU0goKTsKKyNl bHNlIC8vIFBMQVRGT1JNKENPQ09BKQogI2RlZmluZSBGT1JfRUFDSF9PUFRJT04odHlwZV8sIG5h bWVfLCBkZWZhdWx0VmFsdWVfLCBkZXNjcmlwdGlvbl8pICAgICAgXAogICAgICAgICAgICAgb3Zl cnJpZGVPcHRpb25XaXRoSGV1cmlzdGljKG5hbWVfKCksICJKU0NfIiAjbmFtZV8pOwogICAgICAg ICAgICAgSlNDX09QVElPTlMoRk9SX0VBQ0hfT1BUSU9OKQogI3VuZGVmIEZPUl9FQUNIX09QVElP TgorI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQogCiAjaWYgMAogICAgICAgICAgICAgICAgIDsg Ly8gRGVjb25mdXNlIGVkaXRvcnMgdGhhdCBkbyBhdXRvIGluZGVudGF0aW9uCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCShyZXZpc2lvbiAxOTQ0MTUpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgJKHdvcmtpbmcgY29weSkKQEAg LTEwMiw2ICsxMDIsNyBAQCB0eXBlZGVmIE9wdGlvblJhbmdlIG9wdGlvblJhbmdlOwogdHlwZWRl ZiBjb25zdCBjaGFyKiBvcHRpb25TdHJpbmc7CiAKICNkZWZpbmUgSlNDX09QVElPTlModikgXAor ICAgIHYoYm9vbCwgdmFsaWRhdGVPcHRpb25zLCBmYWxzZSwgImNyYXNoZXMgaWYgbWlzLXR5cGVk IEpTQyBvcHRpb25zIHdlcmUgcGFzc2VkIHRvIHRoZSBWTSIpIFwKICAgICB2KHVuc2lnbmVkLCBk dW1wT3B0aW9ucywgMCwgImR1bXBzIEpTQyBvcHRpb25zICgwID0gTm9uZSwgMSA9IE92ZXJyaWRk ZW4gb25seSwgMiA9IEFsbCwgMyA9IFZlcmJvc2UpIikgXAogICAgIFwKICAgICB2KGJvb2wsIHVz ZUxMSW50LCAgdHJ1ZSwgImFsbG93cyB0aGUgTExJTlQgdG8gYmUgdXNlZCBpZiB0cnVlIikgXAo= 268320 2016-01-05 13:50:51 -0800 2016-01-05 13:56:16 -0800 proposed patch for re-landing: no longer restricting where we put -- options on the command line. bug-152549b.patch text/plain 4989 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NjAxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE1LTEyLTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZS1sYW5kaW5nOiBBZGQgdmFsaWRhdGlvbiBvZiBKU0Mgb3B0aW9ucyB0byBjYXRjaCB0eXBvcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjU0OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIElmIGEg SlNDX3h4eCBvcHRpb24gaXMgZm91bmQgYW5kIHh4eCBpcyBub3QgYSB2YWxpZCBvcHRpb24sIHdl IHdpbGwgbm93IGxvZworICAgICAgICAgICBhbiBlcnJvciBtZXNzYWdlLgorICAgICAgICAyLiBJ ZiBhIC0teHh4IGpzYyBvcHRpb24gaXMgc3BlY2lmaWVkLCBidXQgeHh4IGlzIG5vdCBhIHZhbGlk IG9wdGlvbiwgd2Ugd2lsbAorICAgICAgICAgICBub3cgbG9nIGFuIGVycm9yIG1lc3NhZ2UuCisg ICAgICAgIDMuIEFkZGVkIEpTQ192YWxpZGF0ZU9wdGlvbnMsIHdoaWNoIGlmIHNldCB0byB0cnVl IHdpbGwgY2F1c2UgdGhlIFZNIHRvIGNyYXNoIGlmCisgICAgICAgICAgIGFuIGludmFsaWQgb3B0 aW9uIHdhcyBzZWVuIGR1cmluZyBvcHRpb25zIHBhcnNpbmcuCisKKyAgICAgICAgSW4gdGhpcyB2 ZXJzaW9uIGZvciByZS1sYW5kaW5nLCBJIHJlbW92ZWQgdGhlIGNoYW5nZSB3aGVyZSBJIGRpc2Fs bG93ZWQgLS0gb3B0aW9ucworICAgICAgICBhZnRlciB0aGUgc2NyaXB0IG5hbWUuICBBcHBhcmVu dGx5LCB3ZSBoYXZlIHNvbWUgdGVzdCBoYXJuZXNzZXMgdGhhdCBkbyBhcHBlbmQgdGhlCisgICAg ICAgIC0tIG9wdGlvbnMgYWZ0ZXIgdGhlIHNjcmlwdCBuYW1lLgorCisgICAgICAgICoganNjLmNw cDoKKyAgICAgICAgKENvbW1hbmRMaW5lOjpwYXJzZUFyZ3VtZW50cyk6CisgICAgICAgICogcnVu dGltZS9PcHRpb25zLmNwcDoKKyAgICAgICAgKEpTQzo6T3B0aW9uczo6aW5pdGlhbGl6ZSk6Cisg ICAgICAgICogcnVudGltZS9PcHRpb25zLmg6CisKIDIwMTYtMDEtMDUgIENvbW1pdCBRdWV1ZSAg PGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHIxOTQ1OTAuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMTk0NjAxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4ODks NiArMTg4OSw3IEBAIHZvaWQgQ29tbWFuZExpbmU6OnBhcnNlQXJndW1lbnRzKGludCBhcmcKICAg ICBib29sIG5lZWRUb0R1bXBPcHRpb25zID0gZmFsc2U7CiAgICAgYm9vbCBuZWVkVG9FeGl0ID0g ZmFsc2U7CiAKKyAgICBib29sIGhhc0JhZEpTQ09wdGlvbnMgPSBmYWxzZTsKICAgICBmb3IgKDsg aSA8IGFyZ2M7ICsraSkgewogICAgICAgICBjb25zdCBjaGFyKiBhcmcgPSBhcmd2W2ldOwogICAg ICAgICBpZiAoIXN0cmNtcChhcmcsICItZiIpKSB7CkBAIC0xOTUzLDkgKzE5NTQsMTIgQEAgdm9p ZCBDb21tYW5kTGluZTo6cGFyc2VBcmd1bWVudHMoaW50IGFyZwogICAgICAgICB9CiAKICAgICAg ICAgLy8gU2VlIGlmIHRoZSAtLSBvcHRpb24gaXMgYSBKU0MgVk0gb3B0aW9uLgotICAgICAgICBp ZiAoc3Ryc3RyKGFyZywgIi0tIikgPT0gYXJnICYmIEpTQzo6T3B0aW9uczo6c2V0T3B0aW9uKCZh cmdbMl0pKSB7Ci0gICAgICAgICAgICAvLyBUaGUgYXJnIHdhcyByZWNvZ25pemVkIGFzIGEgVk0g b3B0aW9uIGFuZCBoYXMgYmVlbiBwYXJzZWQuCi0gICAgICAgICAgICBjb250aW51ZTsgLy8gSnVz dCBjb250aW51ZSB3aXRoIHRoZSBuZXh0IGFyZy4gCisgICAgICAgIGlmIChzdHJzdHIoYXJnLCAi LS0iKSA9PSBhcmcpIHsKKyAgICAgICAgICAgIGlmICghSlNDOjpPcHRpb25zOjpzZXRPcHRpb24o JmFyZ1syXSkpIHsKKyAgICAgICAgICAgICAgICBoYXNCYWRKU0NPcHRpb25zID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICBkYXRhTG9nKCJFUlJPUjogaW52YWxpZCBvcHRpb246ICIsIGFyZywgIlxu Iik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCiAg ICAgICAgIC8vIFRoaXMgYXJnIGlzIG5vdCByZWNvZ25pemVkIGJ5IHRoZSBWTSBub3IgYnkganNj LiBQYXNzIGl0IG9uIHRvIHRoZQpAQCAtMTk2Myw2ICsxOTY3LDkgQEAgdm9pZCBDb21tYW5kTGlu ZTo6cGFyc2VBcmd1bWVudHMoaW50IGFyZwogICAgICAgICBtX3NjcmlwdHMuYXBwZW5kKFNjcmlw dCh0cnVlLCBhcmd2W2ldKSk7CiAgICAgfQogCisgICAgaWYgKGhhc0JhZEpTQ09wdGlvbnMgJiYg SlNDOjpPcHRpb25zOjp2YWxpZGF0ZU9wdGlvbnMoKSkKKyAgICAgICAgQ1JBU0goKTsKKwogICAg IGlmIChtX3NjcmlwdHMuaXNFbXB0eSgpKQogICAgICAgICBtX2ludGVyYWN0aXZlID0gdHJ1ZTsK IApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHJldmlz aW9uIDE5NDYwMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2ICszOSwxMCBAQAogI2luY2x1ZGUgPHd0Zi9TdHJpbmdF eHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKKyNpZiBQTEFU Rk9STShDT0NPQSkKKyNpbmNsdWRlIDxjcnRfZXh0ZXJucy5oPgorI2VuZGlmCisKICNpZiBPUyhX SU5ET1dTKQogI2luY2x1ZGUgIk1hY3JvQXNzZW1ibGVyWDg2LmgiCiAjZW5kaWYKQEAgLTM3Niwx MCArMzgwLDI1IEBAIHZvaWQgT3B0aW9uczo6aW5pdGlhbGl6ZSgpCiAgICAgICAgICAgICAvLyBB bGxvdyBlbnZpcm9ubWVudCB2YXJzIHRvIG92ZXJyaWRlIG9wdGlvbnMgaWYgYXBwbGljYWJsZS4K ICAgICAgICAgICAgIC8vIFRoZSBldm4gdmFyIHNob3VsZCBiZSB0aGUgbmFtZSBvZiB0aGUgb3B0 aW9uIHByZWZpeGVkIHdpdGgKICAgICAgICAgICAgIC8vICJKU0NfIi4KKyNpZiBQTEFURk9STShD T0NPQSkKKyAgICAgICAgICAgIGJvb2wgaGFzQmFkT3B0aW9ucyA9IGZhbHNlOworICAgICAgICAg ICAgZm9yIChjaGFyKiogZW52cCA9ICpfTlNHZXRFbnZpcm9uKCk7ICplbnZwOyBlbnZwKyspIHsK KyAgICAgICAgICAgICAgICBjb25zdCBjaGFyKiBlbnYgPSAqZW52cDsKKyAgICAgICAgICAgICAg ICBpZiAoIXN0cm5jbXAoIkpTQ18iLCBlbnYsIDQpKSB7CisgICAgICAgICAgICAgICAgICAgIGlm ICghT3B0aW9uczo6c2V0T3B0aW9uKCZlbnZbNF0pKSB7CisgICAgICAgICAgICAgICAgICAgICAg ICBkYXRhTG9nKCJFUlJPUjogaW52YWxpZCBvcHRpb246ICIsICplbnZwLCAiXG4iKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGhhc0JhZE9wdGlvbnMgPSB0cnVlOworICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYg KGhhc0JhZE9wdGlvbnMgJiYgT3B0aW9uczo6dmFsaWRhdGVPcHRpb25zKCkpCisgICAgICAgICAg ICAgICAgQ1JBU0goKTsKKyNlbHNlIC8vIFBMQVRGT1JNKENPQ09BKQogI2RlZmluZSBGT1JfRUFD SF9PUFRJT04odHlwZV8sIG5hbWVfLCBkZWZhdWx0VmFsdWVfLCBkZXNjcmlwdGlvbl8pICAgICAg XAogICAgICAgICAgICAgb3ZlcnJpZGVPcHRpb25XaXRoSGV1cmlzdGljKG5hbWVfKCksICJKU0Nf IiAjbmFtZV8pOwogICAgICAgICAgICAgSlNDX09QVElPTlMoRk9SX0VBQ0hfT1BUSU9OKQogI3Vu ZGVmIEZPUl9FQUNIX09QVElPTgorI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQogCiAjZGVmaW5l IEZPUl9FQUNIX09QVElPTihhbGlhc2VkTmFtZV8sIHVuYWxpYXNlZE5hbWVfLCBlcXVpdmFsZW5j ZV8pIFwKICAgICAgICAgICAgIG92ZXJyaWRlQWxpYXNlZE9wdGlvbldpdGhIZXVyaXN0aWMoIkpT Q18iICNhbGlhc2VkTmFtZV8pOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T3B0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09w dGlvbnMuaAkocmV2aXNpb24gMTk0NjAxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvT3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgdHlwZWRlZiBP cHRpb25SYW5nZSBvcHRpb25SYW5nZTsKIHR5cGVkZWYgY29uc3QgY2hhciogb3B0aW9uU3RyaW5n OwogCiAjZGVmaW5lIEpTQ19PUFRJT05TKHYpIFwKKyAgICB2KGJvb2wsIHZhbGlkYXRlT3B0aW9u cywgZmFsc2UsICJjcmFzaGVzIGlmIG1pcy10eXBlZCBKU0Mgb3B0aW9ucyB3ZXJlIHBhc3NlZCB0 byB0aGUgVk0iKSBcCiAgICAgdih1bnNpZ25lZCwgZHVtcE9wdGlvbnMsIDAsICJkdW1wcyBKU0Mg b3B0aW9ucyAoMCA9IE5vbmUsIDEgPSBPdmVycmlkZGVuIG9ubHksIDIgPSBBbGwsIDMgPSBWZXJi b3NlKSIpIFwKICAgICBcCiAgICAgdihib29sLCB1c2VMTEludCwgIHRydWUsICJhbGxvd3MgdGhl IExMSU5UIHRvIGJlIHVzZWQgaWYgdHJ1ZSIpIFwK