89316 2012-06-17 14:35:58 -0700 DFG should attempt to use structure watchpoints for all inlined get_by_id's and put_by_id's 2012-06-17 18:59:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo oldest_to_newest 651039 0 fpizlo 2012-06-17 14:35:58 -0700 We already have the functionality and now we should just enable it in all of the obvious places. Patch forthcoming. 651040 1 148025 fpizlo 2012-06-17 14:40:42 -0700 Created attachment 148025 the patch 651087 2 fpizlo 2012-06-17 18:59:38 -0700 Landed in http://trac.webkit.org/changeset/120556 148025 2012-06-17 14:40:42 -0700 2012-06-17 15:54:36 -0700 the patch watchallstructs_patch_1.diff text/plain 5373 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTIwNTUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDEyLTA2LTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIHNob3VsZCB1c2Ugc3RydWN0dXJlIHdhdGNocG9pbnRzIHNob3VsZCBiZSB1c2VkIGZvciBh bGwgaW5saW5lZCBnZXRfYnlfaWQncworICAgICAgICBhbmQgcHV0X2J5X2lkJ3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MzE2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQ YXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjphZGRTdHJ1Y3R1 cmVUcmFuc2l0aW9uQ2hlY2spOgorICAgICAgICAoQnl0ZUNvZGVQYXJzZXIpOgorICAgICAgICAo SlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVHZXRCeUlkKToKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisKIDIwMTItMDYtMTUgIFlvbmcgTGkg IDx5b2xpQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFB1dCBwbGF0Zm9ybS1zcGVj aWZpYyBHQyBwb2xpY3kgaW4gR0NBY3Rpdml0eUNhbGxiYWNrCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkocmV2aXNpb24gMTIwNTUw KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc1MCw3ICs3NTAsNyBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4g Y2FsbDsKICAgICB9CiAgICAgCi0gICAgdm9pZCBhZGRTdHJ1Y3R1cmVUcmFuc2l0aW9uQ2hlY2so SlNDZWxsKiBvYmplY3QsIFN0cnVjdHVyZSogc3RydWN0dXJlKQorICAgIE5vZGVJbmRleCBhZGRT dHJ1Y3R1cmVUcmFuc2l0aW9uQ2hlY2soSlNDZWxsKiBvYmplY3QsIFN0cnVjdHVyZSogc3RydWN0 dXJlKQogICAgIHsKICAgICAgICAgLy8gQWRkIGEgd2VhayBKUyBjb25zdGFudCBmb3IgdGhlIG9i amVjdCByZWdhcmRsZXNzLCBzaW5jZSB0aGUgY29kZSBzaG91bGQKICAgICAgICAgLy8gYmUgamV0 dGlzb25lZCBpZiB0aGUgb2JqZWN0IGV2ZXIgZGllcy4KQEAgLTc1OCwxMCArNzU4LDE3IEBAIHBy aXZhdGU6CiAgICAgICAgIAogICAgICAgICBpZiAob2JqZWN0LT5zdHJ1Y3R1cmUoKSA9PSBzdHJ1 Y3R1cmUgJiYgc3RydWN0dXJlLT50cmFuc2l0aW9uV2F0Y2hwb2ludFNldElzU3RpbGxWYWxpZCgp KSB7CiAgICAgICAgICAgICBhZGRUb0dyYXBoKFN0cnVjdHVyZVRyYW5zaXRpb25XYXRjaHBvaW50 LCBPcEluZm8oc3RydWN0dXJlKSwgb2JqZWN0SW5kZXgpOwotICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgcmV0dXJuIG9iamVjdEluZGV4OwogICAgICAgICB9CiAgICAgICAgIAogICAg ICAgICBhZGRUb0dyYXBoKENoZWNrU3RydWN0dXJlLCBPcEluZm8obV9ncmFwaC5hZGRTdHJ1Y3R1 cmVTZXQoc3RydWN0dXJlKSksIG9iamVjdEluZGV4KTsKKyAgICAgICAgCisgICAgICAgIHJldHVy biBvYmplY3RJbmRleDsKKyAgICB9CisgICAgCisgICAgTm9kZUluZGV4IGFkZFN0cnVjdHVyZVRy YW5zaXRpb25DaGVjayhKU0NlbGwqIG9iamVjdCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZGRT dHJ1Y3R1cmVUcmFuc2l0aW9uQ2hlY2sob2JqZWN0LCBvYmplY3QtPnN0cnVjdHVyZSgpKTsKICAg ICB9CiAgICAgCiAgICAgU3BlY3VsYXRlZFR5cGUgZ2V0UHJlZGljdGlvbldpdGhvdXRPU1JFeGl0 KE5vZGVJbmRleCBub2RlSW5kZXgsIHVuc2lnbmVkIGJ5dGVjb2RlSW5kZXgpCkBAIC0xNTkxLDgg KzE1OTgsNyBAQCB2b2lkIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVHZXRCeUlkKAogICAgICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZ2V0QnlJZFN0YXR1cy5jaGFpbigpLnNpemUoKTsgKytp KSB7CiAgICAgICAgICAgICBjdXJyZW50T2JqZWN0ID0gYXNPYmplY3QoY3VycmVudFN0cnVjdHVy ZS0+cHJvdG90eXBlRm9yTG9va3VwKG1faW5saW5lU3RhY2tUb3AtPm1fY29kZUJsb2NrKSk7CiAg ICAgICAgICAgICBjdXJyZW50U3RydWN0dXJlID0gZ2V0QnlJZFN0YXR1cy5jaGFpbigpW2ldOwot ICAgICAgICAgICAgYmFzZSA9IGFkZFRvR3JhcGgoV2Vha0pTQ29uc3RhbnQsIE9wSW5mbyhjdXJy ZW50T2JqZWN0KSk7Ci0gICAgICAgICAgICBhZGRUb0dyYXBoKENoZWNrU3RydWN0dXJlLCBPcElu Zm8obV9ncmFwaC5hZGRTdHJ1Y3R1cmVTZXQoY3VycmVudFN0cnVjdHVyZSkpLCBiYXNlKTsKKyAg ICAgICAgICAgIGJhc2UgPSBhZGRTdHJ1Y3R1cmVUcmFuc2l0aW9uQ2hlY2soY3VycmVudE9iamVj dCwgY3VycmVudFN0cnVjdHVyZSk7CiAgICAgICAgIH0KICAgICAgICAgdXNlSW5saW5lU3RvcmFn ZSA9IGN1cnJlbnRTdHJ1Y3R1cmUtPmlzVXNpbmdJbmxpbmVTdG9yYWdlKCk7CiAgICAgfSBlbHNl CkBAIC0xNjEwLDggKzE2MTYsNyBAQCB2b2lkIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVHZXRCeUlk KAogICAgIGlmIChnZXRCeUlkU3RhdHVzLnNwZWNpZmljVmFsdWUoKSkgewogICAgICAgICBBU1NF UlQoZ2V0QnlJZFN0YXR1cy5zcGVjaWZpY1ZhbHVlKCkuaXNDZWxsKCkpOwogICAgICAgICAKLSAg ICAgICAgc2V0KGRlc3RpbmF0aW9uT3BlcmFuZCwKLSAgICAgICAgICAgIGFkZFRvR3JhcGgoV2Vh a0pTQ29uc3RhbnQsIE9wSW5mbyhnZXRCeUlkU3RhdHVzLnNwZWNpZmljVmFsdWUoKS5hc0NlbGwo KSkpKTsKKyAgICAgICAgc2V0KGRlc3RpbmF0aW9uT3BlcmFuZCwgY2VsbENvbnN0YW50KGdldEJ5 SWRTdGF0dXMuc3BlY2lmaWNWYWx1ZSgpLmFzQ2VsbCgpKSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgCkBAIC0yMjEwLDIxICsyMjE1LDE3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBh cnNlQmxvY2sodW5zaWduZWQKIAogICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoQ2hlY2tTdHJ1 Y3R1cmUsIE9wSW5mbyhtX2dyYXBoLmFkZFN0cnVjdHVyZVNldChwdXRCeUlkU3RhdHVzLm9sZFN0 cnVjdHVyZSgpKSksIGJhc2UpOwogICAgICAgICAgICAgICAgIGlmICghZGlyZWN0KSB7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICghcHV0QnlJZFN0YXR1cy5vbGRTdHJ1Y3R1cmUoKS0+c3RvcmVk UHJvdG90eXBlKCkuaXNOdWxsKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBhZGRUb0dyYXBo KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIENoZWNrU3RydWN0dXJlLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE9wSW5mbyhtX2dyYXBoLmFkZFN0cnVjdHVyZVNldChwdXRCeUlk U3RhdHVzLm9sZFN0cnVjdHVyZSgpLT5zdG9yZWRQcm90b3R5cGUoKS5hc0NlbGwoKS0+c3RydWN0 dXJlKCkpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjZWxsQ29uc3RhbnQocHV0QnlJ ZFN0YXR1cy5vbGRTdHJ1Y3R1cmUoKS0+c3RvcmVkUHJvdG90eXBlKCkuYXNDZWxsKCkpKTsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKCFwdXRCeUlkU3RhdHVzLm9sZFN0cnVjdHVyZSgpLT5zdG9y ZWRQcm90b3R5cGUoKS5pc051bGwoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgYWRkU3Ry dWN0dXJlVHJhbnNpdGlvbkNoZWNrKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1dEJ5 SWRTdGF0dXMub2xkU3RydWN0dXJlKCktPnN0b3JlZFByb3RvdHlwZSgpLmFzQ2VsbCgpKTsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg ICAgICAgZm9yIChXcml0ZUJhcnJpZXI8U3RydWN0dXJlPiogaXQgPSBwdXRCeUlkU3RhdHVzLnN0 cnVjdHVyZUNoYWluKCktPmhlYWQoKTsgKml0OyArK2l0KSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBKU1ZhbHVlIHByb3RvdHlwZSA9ICgqaXQpLT5zdG9yZWRQcm90b3R5cGUoKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChwcm90b3R5cGUuaXNOdWxsKCkpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQo cHJvdG90eXBlLmlzQ2VsbCgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgo Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgQ2hlY2tTdHJ1Y3R1cmUsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgT3BJbmZvKG1fZ3JhcGguYWRkU3RydWN0dXJlU2V0KHByb3RvdHlw ZS5hc0NlbGwoKS0+c3RydWN0dXJlKCkpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBj ZWxsQ29uc3RhbnQocHJvdG90eXBlLmFzQ2VsbCgpKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBhZGRTdHJ1Y3R1cmVUcmFuc2l0aW9uQ2hlY2socHJvdG90eXBlLmFzQ2VsbCgpKTsKICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBBU1NF UlQocHV0QnlJZFN0YXR1cy5vbGRTdHJ1Y3R1cmUoKS0+dHJhbnNpdGlvbldhdGNocG9pbnRTZXRI YXNCZWVuSW52YWxpZGF0ZWQoKSk7CkBAIC0yMzIxLDggKzIzMjIsNyBAQCBib29sIEJ5dGVDb2Rl UGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAgICAgICAgICAKICAgICAgICAgICAgIEpT VmFsdWUgc3BlY2lmaWNWYWx1ZSA9IGdsb2JhbE9iamVjdC0+cmVnaXN0ZXJBdChlbnRyeS5nZXRJ bmRleCgpKS5nZXQoKTsKICAgICAgICAgICAgIEFTU0VSVChzcGVjaWZpY1ZhbHVlLmlzQ2VsbCgp KTsKLSAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLAotICAg ICAgICAgICAgICAgIGFkZFRvR3JhcGgoV2Vha0pTQ29uc3RhbnQsIE9wSW5mbyhzcGVjaWZpY1Zh bHVlLmFzQ2VsbCgpKSkpOworICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51 Lm9wZXJhbmQsIGNlbGxDb25zdGFudChzcGVjaWZpY1ZhbHVlLmFzQ2VsbCgpKSk7CiAgICAgICAg ICAgICAKICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX2dldF9nbG9iYWxfdmFyX3dhdGNoYWJs ZSk7CiAgICAgICAgIH0K