183311 2018-03-03 02:38:10 -0800 dump-class-layout mishandles duplicates base classes and miscomputes padding 2018-05-19 11:42:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 183939 1 joepeck joepeck commit-queue dino joepeck lforschler simon.fraser wenson_hsieh oldest_to_newest 1403466 0 joepeck 2018-03-03 02:38:10 -0800 dump-class-layout mishandles duplicates base classes and miscomputes padding INPUT: (I want to see the layout of Target) > class VirtualBaseOne { > public: > virtual ~VirtualBaseOne() {} > }; > > class VirtualBaseTwo { > public: > virtual ~VirtualBaseTwo() {} > }; > > class OtherBase {}; > class OtherOtherBase : public OtherBase {}; > > class ThingWithData { > void* inputs[16]; > unsigned count; > }; > > class Base : virtual public VirtualBaseOne, virtual public VirtualBaseTwo, virtual protected OtherOtherBase { > public: > virtual ~Base() {}; > bool x; > ThingWithData data; > }; > > class Target : public Base { > int a; > int b; > int c; > int d; > }; > > int main() { > Target x; > return 0; > } BEFORE: > Found 1 types matching "Target" in "/tmp/a.out" for systemArch > +0 {176} Target > +0 {160} Base > +0 { 8} VirtualBaseOne > +0 < 8> __vtbl_ptr_type * _vptr; > +0 { 1} OtherOtherBase > +0 { 1} OtherBase > +0 { 8} VirtualBaseOne > +0 < 8> __vtbl_ptr_type * _vptr; > +0 { 1} OtherOtherBase > +0 { 1} OtherBase > +1 < 7> <PADDING> > +8 < 1> bool x; > +9 < 7> <PADDING> > +16 <136> ThingWithData data; > +16 <128> void *[16] inputs; > +144 < 4> unsigned int count; > +148 < 4> <PADDING> > +152 { 8} VirtualBaseTwo > +152 < 8> __vtbl_ptr_type * _vptr; > +152 { 8} VirtualBaseTwo > +152 < 8> __vtbl_ptr_type * _vptr; > +0 { 8} VirtualBaseOne > +0 < 8> __vtbl_ptr_type * _vptr; > +0 { 1} OtherOtherBase > +0 { 1} OtherBase > +1 <151> <PADDING> > +152 < 4> int a; > +156 < 4> int b; > +160 < 4> int c; > +164 < 4> int d; > +168 { 8} VirtualBaseTwo > +168 < 8> __vtbl_ptr_type * _vptr; > Total byte size: 176 > Total pad bytes: 169 > Padding percentage: 96.02 % AFTER: > Found 1 types matching "Target" in "/tmp/a.out" for systemArch > +0 {176} Target > +0 {160} Base > +0 { 8} VirtualBaseOne > +0 < 8> __vtbl_ptr_type * _vptr; > +0 { 1} OtherOtherBase > +0 { 1} OtherBase > +1 < 7> <PADDING> > +8 < 1> bool x; > +9 < 7> <PADDING> > +16 <136> ThingWithData data; > +16 <128> void *[16] inputs; > +144 < 4> unsigned int count; > +148 < 4> <PADDING> > +152 { 8} VirtualBaseTwo > +152 < 8> __vtbl_ptr_type * _vptr; > +152 < 4> int a; > +156 < 4> int b; > +160 < 4> int c; > +164 < 4> int d; > +168 { 8} VirtualBaseTwo > +168 < 8> __vtbl_ptr_type * _vptr; > Total byte size: 176 > Total pad bytes: 18 > Padding percentage: 10.23 % 1403467 1 334953 joepeck 2018-03-03 02:40:54 -0800 Created attachment 334953 [PATCH] Proposed Fix 1403694 2 334953 commit-queue 2018-03-05 11:40:31 -0800 Comment on attachment 334953 [PATCH] Proposed Fix Rejecting attachment 334953 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 334953, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: rdparty/autoinstalled/mechanize/_urllib2_fork.py", line 332, in _call_chain result = func(*args) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1170, in https_open return self.do_open(conn_factory, req) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1118, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://webkit-queues.webkit.org/results/6815059 1425451 3 simon.fraser 2018-05-19 11:42:34 -0700 This fix isn't right: bug 185801 334953 2018-03-03 02:40:54 -0800 2018-03-05 11:40:31 -0800 [PATCH] Proposed Fix improve-dump-1.patch text/plain 3490 joepeck ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MmRj NGNiMDJmNS4uNzk5MzI5MzhkMzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wMy0wMyAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIGR1bXAtY2xhc3MtbGF5b3V0IG1p c2hhbmRsZXMgZHVwbGljYXRlcyBiYXNlIGNsYXNzZXMgYW5kIG1pc2NvbXB1dGVzIHBhZGRpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzMxMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy9kdW1wLWNsYXNzLWxheW91dDoKKyAgICAgICAgKHZlcmlmeV90eXBlKToKKyAgICAgICAgKHZl cmlmeV90eXBlX3JlY3Vyc2l2ZSk6CisgICAgICAgIEtlZXAgYSBsaXN0IG9mIHNlZW4gKG9mZnNl dCwgdHlwZSkgdGhhdCB3ZSBoYXZlIG91dHB1dCBhbmQgZG9uJ3QgcmUtb3V0cHV0IHRoZW0uCisg ICAgICAgIFRoZSBQeXRob24gdHlwZXMgbGlzdCB0aGUgYmFzZSBjbGFzc2VzIGFzIG1lbWJlcnMg bXVsdGlwbGUgdGltZXMgYXMgeW91IGl0ZXJhdGUKKyAgICAgICAgdGhyb3VnaCB0aGUgbWVtYmVy cywgc28ganVzdCBpZ25vcmUgdGhlbSBpZiB3ZSBoYXZlIHNlZW0gdGhlbSBhbHJlYWR5IGF0IGEK KyAgICAgICAgc3BlY2lmaWMgb2Zmc2V0LgorCiAyMDE4LTAyLTEzICBEb24gT2xtc3RlYWQgIDxk b24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBNYWtlIFdlYkNvcmUgaGVh ZGVycyBjb3BpZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvZHVtcC1jbGFzcy1sYXlvdXQg Yi9Ub29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0CmluZGV4IDRlMjNiYjczYTAxLi4wMzc0 NDdlNmM4YiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9kdW1wLWNsYXNzLWxheW91dAorKysg Yi9Ub29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0CkBAIC0yOCw3ICsyOCw4IEBAIGltcG9y dCBzeXMKIGltcG9ydCBnZXRvcHQKIGltcG9ydCBhcmdwYXJzZQogaW1wb3J0IG9zCi1pbXBvcnQg c3VicHJvY2VzczsKK2ltcG9ydCBzdWJwcm9jZXNzCitmcm9tIHNldHMgaW1wb3J0IFNldAogCiAK IGZyYW1ld29yayA9ICJXZWJDb3JlIgpAQCAtNTcsNyArNTgsOCBAQCBkZWYgaW1wb3J0X2xsZGIo KToKIAogZGVmIHZlcmlmeV90eXBlKHRhcmdldCwgdHlwZSk6CiAgICAgdHlwZW5hbWUgPSB0eXBl LkdldE5hbWUoKQotICAgIChlbmRfb2Zmc2V0LCBwYWRkaW5nKSA9IHZlcmlmeV90eXBlX3JlY3Vy c2l2ZSh0YXJnZXQsIHR5cGUsIE5vbmUsIDAsIDAsIDApCisgICAgc2VlbkJlZm9yZSA9IFNldCgp CisgICAgKGVuZF9vZmZzZXQsIHBhZGRpbmcpID0gdmVyaWZ5X3R5cGVfcmVjdXJzaXZlKHRhcmdl dCwgdHlwZSwgTm9uZSwgMCwgMCwgMCwgc2VlbkJlZm9yZSkKICAgICBieXRlX3NpemUgPSB0eXBl LkdldEJ5dGVTaXplKCkKICAgICBwcmludCAnVG90YWwgYnl0ZSBzaXplOiAldScgJSAoYnl0ZV9z aXplKQogICAgIHByaW50ICdUb3RhbCBwYWQgYnl0ZXM6ICV1JyAlIChwYWRkaW5nKQpAQCAtNjUs NyArNjcsNyBAQCBkZWYgdmVyaWZ5X3R5cGUodGFyZ2V0LCB0eXBlKToKICAgICAgICAgcHJpbnQg J1BhZGRpbmcgcGVyY2VudGFnZTogJTIuMmYgJSUnICUgKChmbG9hdChwYWRkaW5nKSAvIGZsb2F0 KGJ5dGVfc2l6ZSkpICogMTAwLjApCiAgICAgcHJpbnQKIAotZGVmIHZlcmlmeV90eXBlX3JlY3Vy c2l2ZSh0YXJnZXQsIHR5cGUsIG1lbWJlcl9uYW1lLCBkZXB0aCwgYmFzZV9vZmZzZXQsIHBhZGRp bmcpOgorZGVmIHZlcmlmeV90eXBlX3JlY3Vyc2l2ZSh0YXJnZXQsIHR5cGUsIG1lbWJlcl9uYW1l LCBkZXB0aCwgYmFzZV9vZmZzZXQsIHBhZGRpbmcsIHNlZW5CZWZvcmUpOgogICAgIHByZXZfZW5k X29mZnNldCA9IGJhc2Vfb2Zmc2V0CiAgICAgdHlwZW5hbWUgPSB0eXBlLkdldE5hbWUoKQogICAg IGJ5dGVfc2l6ZSA9IHR5cGUuR2V0Qnl0ZVNpemUoKQpAQCAtODUsNiArODcsMTEgQEAgZGVmIHZl cmlmeV90eXBlX3JlY3Vyc2l2ZSh0YXJnZXQsIHR5cGUsIG1lbWJlcl9uYW1lLCBkZXB0aCwgYmFz ZV9vZmZzZXQsIHBhZGRpbmcKICAgICAgICAgICAgIG1lbWJlcl90b3RhbF9vZmZzZXQgPSBtZW1i ZXJfb2Zmc2V0ICsgYmFzZV9vZmZzZXQKICAgICAgICAgICAgIG1lbWJlcl9ieXRlX3NpemUgPSBt ZW1iZXJfdHlwZS5HZXRCeXRlU2l6ZSgpCiAgICAgICAgICAgICBtZW1iZXJfaXNfY2xhc3Nfb3Jf c3RydWN0ID0gRmFsc2UKKworICAgICAgICAgICAgaWYgKG1lbWJlcl9vZmZzZXQsIG1lbWJlcl9u YW1lKSBpbiBzZWVuT2Zmc2V0OgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAg ICBzZWVuT2Zmc2V0LmFkZCgobWVtYmVyX29mZnNldCwgbWVtYmVyX25hbWUpKQorCiAgICAgICAg ICAgICBpZiBtZW1iZXJfdHlwZV9jbGFzcyA9PSBsbGRiLmVUeXBlQ2xhc3NTdHJ1Y3Qgb3IgbWVt YmVyX3R5cGVfY2xhc3MgPT0gbGxkYi5lVHlwZUNsYXNzQ2xhc3M6CiAgICAgICAgICAgICAgICAg bWVtYmVyX2lzX2NsYXNzX29yX3N0cnVjdCA9IFRydWUKICAgICAgICAgICAgIGlmIG1lbWJlcl9p ZHggPT0gMCBhbmQgbWVtYmVyX29mZnNldCA9PSB0YXJnZXQuR2V0QWRkcmVzc0J5dGVTaXplKCkg YW5kIHR5cGUuSXNQb2x5bW9ycGhpY0NsYXNzKCk6CkBAIC05OCw3ICsxMDUsNyBAQCBkZWYgdmVy aWZ5X3R5cGVfcmVjdXJzaXZlKHRhcmdldCwgdHlwZSwgbWVtYmVyX25hbWUsIGRlcHRoLCBiYXNl X29mZnNldCwgcGFkZGluZwogICAgICAgICAgICAgICAgICAgICBwcmludCAnJSs0dSA8JTN1PiAl czxQQURESU5HPicgJSAocHJldl9lbmRfb2Zmc2V0LCBtZW1iZXJfcGFkZGluZywgJyAgICAnICog KGRlcHRoICsgMSkpCiAKICAgICAgICAgICAgIGlmIG1lbWJlcl9pc19jbGFzc19vcl9zdHJ1Y3Q6 Ci0gICAgICAgICAgICAgICAgKHByZXZfZW5kX29mZnNldCwgcGFkZGluZykgPSB2ZXJpZnlfdHlw ZV9yZWN1cnNpdmUodGFyZ2V0LCBtZW1iZXJfY2Fub25pY2FsX3R5cGUsIG1lbWJlcl9uYW1lLCBk ZXB0aCArIDEsIG1lbWJlcl90b3RhbF9vZmZzZXQsIHBhZGRpbmcpCisgICAgICAgICAgICAgICAg KHByZXZfZW5kX29mZnNldCwgcGFkZGluZykgPSB2ZXJpZnlfdHlwZV9yZWN1cnNpdmUodGFyZ2V0 LCBtZW1iZXJfY2Fub25pY2FsX3R5cGUsIG1lbWJlcl9uYW1lLCBkZXB0aCArIDEsIG1lbWJlcl90 b3RhbF9vZmZzZXQsIHBhZGRpbmcsIHNlZW5CZWZvcmUpCiAgICAgICAgICAgICBlbHNlOgogICAg ICAgICAgICAgICAgIHByZXZfZW5kX29mZnNldCA9IG1lbWJlcl90b3RhbF9vZmZzZXQgKyBtZW1i ZXJfYnl0ZV9zaXplCiAgICAgICAgICAgICAgICAgbWVtYmVyX3R5cGVuYW1lID0gbWVtYmVyX3R5 cGUuR2V0TmFtZSgpCg==