137006 2014-09-22 09:47:09 -0700 FTL allocatePropertyStorage code should involve less copy-paste 2014-09-22 13:26:31 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 136330 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenb mmirman msaboff nrotem oliver sam oldest_to_newest 1036550 0 fpizlo 2014-09-22 09:47:09 -0700 Patch forthcoming. 1036551 1 238485 fpizlo 2014-09-22 09:50:08 -0700 Created attachment 238485 the patch 1036581 2 238485 msaboff 2014-09-22 13:04:57 -0700 Comment on attachment 238485 the patch r=me 1036590 3 fpizlo 2014-09-22 13:26:31 -0700 Landed in http://trac.webkit.org/changeset/173847 238485 2014-09-22 09:50:08 -0700 2014-09-22 13:04:56 -0700 the patch blah.patch text/plain 7004 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTczODM4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDE0LTA5LTIyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMIGFsbG9jYXRlUHJvcGVydHlTdG9yYWdlIGNvZGUgc2hvdWxkIGludm9sdmUgbGVzcyBjb3B5 LXBhc3RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzcwMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZ0bC9GVExMb3dlckRGR1RvTExWTS5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJERkdU b0xMVk06OmFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dl ckRGR1RvTExWTTo6cmVhbGxvY2F0ZVByb3BlcnR5U3RvcmFnZSk6CisgICAgICAgIChKU0M6OkZU TDo6TG93ZXJERkdUb0xMVk06OmFsbG9jYXRlUHJvcGVydHlTdG9yYWdlV2l0aFNpemVJbXBsKToK KwogMjAxNC0wOS0yMSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAg IEZUTCBzaG91bGQgc3RvcmUgdGhlIGZvdXIgYnl0ZXMgb2YgdGhlIGNlbGwgaGVhZGVyIHVzaW5n IGEgMzItYml0IHN0b3JlIHJhdGhlciB0aGFuIGZvdXIgOC1iaXQgc3RvcmVzCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAkocmV2aXNp b24gMTczODM4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExW TS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2MjQsODQgKzQ2MjQsNzQgQEAgcHJpdmF0ZToKICAg ICAgICAgICAgICAgICBtX2NhbGxGcmFtZSwgb2JqZWN0KTsKICAgICAgICAgfQogICAgICAgICAK LSAgICAgICAgTEJhc2ljQmxvY2sgc2xvd1BhdGggPSBGVExfTkVXX0JMT0NLKG1fb3V0LCAoImFs bG9jYXRlUHJvcGVydHlTdG9yYWdlIHNsb3cgcGF0aCIpKTsKLSAgICAgICAgTEJhc2ljQmxvY2sg Y29udGludWF0aW9uID0gRlRMX05FV19CTE9DSyhtX291dCwgKCJhbGxvY2F0ZVByb3BlcnR5U3Rv cmFnZSBjb250aW51YXRpb24iKSk7Ci0gICAgICAgIAotICAgICAgICBMQmFzaWNCbG9jayBsYXN0 TmV4dCA9IG1fb3V0Lmluc2VydE5ld0Jsb2Nrc0JlZm9yZShzbG93UGF0aCk7Ci0gICAgICAgIAot ICAgICAgICBMVmFsdWUgZW5kT2ZTdG9yYWdlID0gYWxsb2NhdGVCYXNpY1N0b3JhZ2VBbmRHZXRF bmQoCi0gICAgICAgICAgICBtX291dC5jb25zdEludFB0cihpbml0aWFsT3V0T2ZMaW5lQ2FwYWNp dHkgKiBzaXplb2YoSlNWYWx1ZSkpLCBzbG93UGF0aCk7Ci0gICAgICAgIAotICAgICAgICBWYWx1 ZUZyb21CbG9jayBmYXN0QnV0dGVyZmx5ID0gbV9vdXQuYW5jaG9yKAotICAgICAgICAgICAgbV9v dXQuYWRkKG1fb3V0LmNvbnN0SW50UHRyKHNpemVvZihJbmRleGluZ0hlYWRlcikpLCBlbmRPZlN0 b3JhZ2UpKTsKLSAgICAgICAgCi0gICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKLSAg ICAgICAgCi0gICAgICAgIG1fb3V0LmFwcGVuZFRvKHNsb3dQYXRoLCBjb250aW51YXRpb24pOwot ICAgICAgICAKLSAgICAgICAgVmFsdWVGcm9tQmxvY2sgc2xvd0J1dHRlcmZseSA9IG1fb3V0LmFu Y2hvcih2bUNhbGwoCi0gICAgICAgICAgICBtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uQWxsb2Nh dGVQcm9wZXJ0eVN0b3JhZ2VXaXRoSW5pdGlhbENhcGFjaXR5KSwgbV9jYWxsRnJhbWUpKTsKLSAg ICAgICAgCi0gICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKLSAgICAgICAgCi0gICAg ICAgIG1fb3V0LmFwcGVuZFRvKGNvbnRpbnVhdGlvbiwgbGFzdE5leHQpOwotICAgICAgICAKLSAg ICAgICAgTFZhbHVlIHJlc3VsdCA9IG1fb3V0LnBoaShtX291dC5pbnRQdHIsIGZhc3RCdXR0ZXJm bHksIHNsb3dCdXR0ZXJmbHkpOworICAgICAgICBMVmFsdWUgcmVzdWx0ID0gYWxsb2NhdGVQcm9w ZXJ0eVN0b3JhZ2VXaXRoU2l6ZUltcGwoaW5pdGlhbE91dE9mTGluZUNhcGFjaXR5KTsKICAgICAg ICAgbV9vdXQuc3RvcmVQdHIocmVzdWx0LCBvYmplY3QsIG1faGVhcHMuSlNPYmplY3RfYnV0dGVy Zmx5KTsKLSAgICAgICAgCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogICAgIAogICAg IExWYWx1ZSByZWFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKAogICAgICAgICBMVmFsdWUgb2JqZWN0 LCBMVmFsdWUgb2xkU3RvcmFnZSwgU3RydWN0dXJlKiBwcmV2aW91cywgU3RydWN0dXJlKiBuZXh0 KQogICAgIHsKLSAgICAgICAgc2l6ZV90IG9sZFNpemUgPSBwcmV2aW91cy0+b3V0T2ZMaW5lQ2Fw YWNpdHkoKSAqIHNpemVvZihKU1ZhbHVlKTsKKyAgICAgICAgc2l6ZV90IG9sZFNpemUgPSBwcmV2 aW91cy0+b3V0T2ZMaW5lQ2FwYWNpdHkoKTsKICAgICAgICAgc2l6ZV90IG5ld1NpemUgPSBvbGRT aXplICogb3V0T2ZMaW5lR3Jvd3RoRmFjdG9yOyAKIAotICAgICAgICBBU1NFUlRfVU5VU0VEKG5l eHQsIG5ld1NpemUgPT0gbmV4dC0+b3V0T2ZMaW5lQ2FwYWNpdHkoKSAqIHNpemVvZihKU1ZhbHVl KSk7CisgICAgICAgIEFTU0VSVF9VTlVTRUQobmV4dCwgbmV3U2l6ZSA9PSBuZXh0LT5vdXRPZkxp bmVDYXBhY2l0eSgpKTsKICAgICAgICAgCiAgICAgICAgIGlmIChwcmV2aW91cy0+Y291bGRIYXZl SW5kZXhpbmdIZWFkZXIoKSkgewotICAgICAgICAgICAgTFZhbHVlIG5ld0FsbG9jU2l6ZSA9IG1f b3V0LmNvbnN0SW50NjQobmV3U2l6ZSAvIHNpemVvZihKU1ZhbHVlKSk7ICAgICAgICAgICAgICAg ICAgICAKKyAgICAgICAgICAgIExWYWx1ZSBuZXdBbGxvY1NpemUgPSBtX291dC5jb25zdEludFB0 cihuZXdTaXplKTsgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgcmV0dXJuIHZtQ2Fs bChtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uUmVhbGxvY2F0ZUJ1dHRlcmZseVRvR3Jvd1Byb3Bl cnR5U3RvcmFnZSksIG1fY2FsbEZyYW1lLCBvYmplY3QsIG5ld0FsbG9jU2l6ZSk7CiAgICAgICAg IH0KICAgICAgICAgCi0gICAgICAgIExCYXNpY0Jsb2NrIHNsb3dQYXRoID0gRlRMX05FV19CTE9D SyhtX291dCwgKCJyZWFsbG9jYXRlUHJvcGVydHlTdG9yYWdlIHNsb3cgcGF0aCIpKTsKLSAgICAg ICAgTEJhc2ljQmxvY2sgY29udGludWF0aW9uID0gRlRMX05FV19CTE9DSyhtX291dCwgKCJyZWFs bG9jYXRlUHJvcGVydHlTdG9yYWdlIGNvbnRpbnVhdGlvbiIpKTsKKyAgICAgICAgTFZhbHVlIHJl c3VsdCA9IGFsbG9jYXRlUHJvcGVydHlTdG9yYWdlV2l0aFNpemVJbXBsKG5ld1NpemUpOworCisg ICAgICAgIHB0cmRpZmZfdCBoZWFkZXJTaXplID0gLXNpemVvZihJbmRleGluZ0hlYWRlcikgLSBz aXplb2Yodm9pZCopOworICAgICAgICBwdHJkaWZmX3QgZW5kU3RvcmFnZSA9IGhlYWRlclNpemUg LSBzdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KG9sZFNpemUgKiBzaXplb2YoSlNWYWx1ZSkpOworCisg ICAgICAgIGZvciAocHRyZGlmZl90IG9mZnNldCA9IGhlYWRlclNpemU7IG9mZnNldCA+IGVuZFN0 b3JhZ2U7IG9mZnNldCAtPSBzaXplb2Yodm9pZCopKSB7CisgICAgICAgICAgICBMVmFsdWUgbG9h ZGVkID0gCisgICAgICAgICAgICAgICAgbV9vdXQubG9hZFB0cihtX291dC5hZGRyZXNzKG1faGVh cHMucHJvcGVydGllcy5hdEFueU51bWJlcigpLCBvbGRTdG9yYWdlLCBvZmZzZXQpKTsKKyAgICAg ICAgICAgIG1fb3V0LnN0b3JlUHRyKGxvYWRlZCwgbV9vdXQuYWRkcmVzcyhtX2hlYXBzLnByb3Bl cnRpZXMuYXRBbnlOdW1iZXIoKSwgcmVzdWx0LCBvZmZzZXQpKTsKKyAgICAgICAgfQorICAgICAg ICAKKyAgICAgICAgbV9vdXQuc3RvcmVQdHIocmVzdWx0LCBtX291dC5hZGRyZXNzKG9iamVjdCwg bV9oZWFwcy5KU09iamVjdF9idXR0ZXJmbHkpKTsKKyAgICAgICAgCisgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgfQorICAgIAorICAgIExWYWx1ZSBhbGxvY2F0ZVByb3BlcnR5U3RvcmFnZVdp dGhTaXplSW1wbChzaXplX3Qgc2l6ZUluVmFsdWVzKQorICAgIHsKKyAgICAgICAgTEJhc2ljQmxv Y2sgc2xvd1BhdGggPSBGVExfTkVXX0JMT0NLKG1fb3V0LCAoImFsbG9jYXRlUHJvcGVydHlTdG9y YWdlV2l0aFNpemVJbXBsIHNsb3cgcGF0aCIpKTsKKyAgICAgICAgTEJhc2ljQmxvY2sgY29udGlu dWF0aW9uID0gRlRMX05FV19CTE9DSyhtX291dCwgKCJhbGxvY2F0ZVByb3BlcnR5U3RvcmFnZVdp dGhTaXplSW1wbCBjb250aW51YXRpb24iKSk7CisgICAgICAgIAogICAgICAgICBMQmFzaWNCbG9j ayBsYXN0TmV4dCA9IG1fb3V0Lmluc2VydE5ld0Jsb2Nrc0JlZm9yZShzbG93UGF0aCk7CiAgICAg ICAgIAotICAgICAgICBMVmFsdWUgZW5kT2ZTdG9yYWdlID0gCi0gICAgICAgICAgICBhbGxvY2F0 ZUJhc2ljU3RvcmFnZUFuZEdldEVuZChtX291dC5jb25zdEludFB0cihuZXdTaXplKSwgc2xvd1Bh dGgpOworICAgICAgICBMVmFsdWUgZW5kT2ZTdG9yYWdlID0gYWxsb2NhdGVCYXNpY1N0b3JhZ2VB bmRHZXRFbmQoCisgICAgICAgICAgICBtX291dC5jb25zdEludFB0cihzaXplSW5WYWx1ZXMgKiBz aXplb2YoSlNWYWx1ZSkpLCBzbG93UGF0aCk7CiAgICAgICAgIAotICAgICAgICBWYWx1ZUZyb21C bG9jayBmYXN0QnV0dGVyZmx5ID0gbV9vdXQuYW5jaG9yKG1fb3V0LmFkZChtX291dC5jb25zdElu dFB0cihzaXplb2YoSW5kZXhpbmdIZWFkZXIpKSwgZW5kT2ZTdG9yYWdlKSk7CisgICAgICAgIFZh bHVlRnJvbUJsb2NrIGZhc3RCdXR0ZXJmbHkgPSBtX291dC5hbmNob3IoCisgICAgICAgICAgICBt X291dC5hZGQobV9vdXQuY29uc3RJbnRQdHIoc2l6ZW9mKEluZGV4aW5nSGVhZGVyKSksIGVuZE9m U3RvcmFnZSkpOwogICAgICAgICAKICAgICAgICAgbV9vdXQuanVtcChjb250aW51YXRpb24pOwog ICAgICAgICAKICAgICAgICAgbV9vdXQuYXBwZW5kVG8oc2xvd1BhdGgsIGNvbnRpbnVhdGlvbik7 CiAgICAgICAgIAotICAgICAgICBMVmFsdWUgbmV3QWxsb2NTaXplID0gbV9vdXQuY29uc3RJbnQ2 NChuZXdTaXplIC8gc2l6ZW9mKEpTVmFsdWUpKTsgICAgICAgCi0gICAgICAgIAotICAgICAgICBM VmFsdWUgc3RvcmFnZUxvY2F0aW9uID0gdm1DYWxsKG1fb3V0Lm9wZXJhdGlvbihvcGVyYXRpb25B bGxvY2F0ZVByb3BlcnR5U3RvcmFnZSksIG1fY2FsbEZyYW1lLCBuZXdBbGxvY1NpemUpOwotICAg ICAgICAKLSAgICAgICAgVmFsdWVGcm9tQmxvY2sgc2xvd0J1dHRlcmZseSA9IG1fb3V0LmFuY2hv cihzdG9yYWdlTG9jYXRpb24pOworICAgICAgICBMVmFsdWUgc2xvd0J1dHRlcmZseVZhbHVlOwor ICAgICAgICBpZiAoc2l6ZUluVmFsdWVzID09IGluaXRpYWxPdXRPZkxpbmVDYXBhY2l0eSkgewor ICAgICAgICAgICAgc2xvd0J1dHRlcmZseVZhbHVlID0gdm1DYWxsKAorICAgICAgICAgICAgICAg IG1fb3V0Lm9wZXJhdGlvbihvcGVyYXRpb25BbGxvY2F0ZVByb3BlcnR5U3RvcmFnZVdpdGhJbml0 aWFsQ2FwYWNpdHkpLAorICAgICAgICAgICAgICAgIG1fY2FsbEZyYW1lKTsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIHNsb3dCdXR0ZXJmbHlWYWx1ZSA9IHZtQ2FsbCgKKyAgICAgICAg ICAgICAgICBtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uQWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2Up LAorICAgICAgICAgICAgICAgIG1fY2FsbEZyYW1lLCBtX291dC5jb25zdEludFB0cihzaXplSW5W YWx1ZXMpKTsKKyAgICAgICAgfQorICAgICAgICBWYWx1ZUZyb21CbG9jayBzbG93QnV0dGVyZmx5 ID0gbV9vdXQuYW5jaG9yKHNsb3dCdXR0ZXJmbHlWYWx1ZSk7CiAgICAgICAgIAogICAgICAgICBt X291dC5qdW1wKGNvbnRpbnVhdGlvbik7CiAgICAgICAgIAogICAgICAgICBtX291dC5hcHBlbmRU byhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKICAgICAgICAgCi0gICAgICAgIExWYWx1ZSByZXN1 bHQgPSBtX291dC5waGkobV9vdXQuaW50UHRyLCBmYXN0QnV0dGVyZmx5LCBzbG93QnV0dGVyZmx5 KTsKLQotICAgICAgICBwdHJkaWZmX3QgaGVhZGVyU2l6ZSA9IC1zaXplb2YoSlNWYWx1ZSkgLSBz aXplb2Yodm9pZCAqKTsKLSAgICAgICAgcHRyZGlmZl90IGVuZFN0b3JhZ2UgPSBoZWFkZXJTaXpl IC0gc3RhdGljX2Nhc3Q8cHRyZGlmZl90PihvbGRTaXplKTsKLQotICAgICAgICBmb3IgKHB0cmRp ZmZfdCBvZmZzZXQgPSBoZWFkZXJTaXplOyBvZmZzZXQgPiBlbmRTdG9yYWdlOyBvZmZzZXQgLT0g c2l6ZW9mKHZvaWQqKSkgewotICAgICAgICAgICAgTFZhbHVlIGxvYWRlZCA9IAotICAgICAgICAg ICAgICAgIG1fb3V0LmxvYWRQdHIobV9vdXQuYWRkcmVzcyhtX2hlYXBzLnByb3BlcnRpZXMuYXRB bnlOdW1iZXIoKSwgb2xkU3RvcmFnZSwgb2Zmc2V0KSk7Ci0gICAgICAgICAgICBtX291dC5zdG9y ZVB0cihsb2FkZWQsIG1fb3V0LmFkZHJlc3MobV9oZWFwcy5wcm9wZXJ0aWVzLmF0QW55TnVtYmVy KCksIHJlc3VsdCwgb2Zmc2V0KSk7Ci0gICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIG1fb3V0 LnN0b3JlUHRyKHJlc3VsdCwgbV9vdXQuYWRkcmVzcyhvYmplY3QsIG1faGVhcHMuSlNPYmplY3Rf YnV0dGVyZmx5KSk7Ci0gICAgICAgIAotICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICBy ZXR1cm4gbV9vdXQucGhpKG1fb3V0LmludFB0ciwgZmFzdEJ1dHRlcmZseSwgc2xvd0J1dHRlcmZs eSk7CiAgICAgfQogICAgIAogICAgIExWYWx1ZSBnZXRCeUlkKExWYWx1ZSBiYXNlKQo=