140727 2015-01-21 09:02:04 -0800 Web Inspector: Don't allow the BasicBlockAnnotator to highlight a section if it's only a closing brace 2015-01-21 14:51:46 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1063070 0 saam 2015-01-21 09:02:04 -0800 There are times when a textual basic block will only consist of blank space, this can happen in the following situation: if (foo) { bar(); return; // Or: throw, break, continue. } // This closing brace will be highlighted, because the code after the return statement is unreachable. This is a common enough case that the BasicBlockAnnotator should special case it. 1063071 1 webkit-bug-importer 2015-01-21 09:02:25 -0800 <rdar://problem/19548864> 1063160 2 245083 saam 2015-01-21 13:57:14 -0800 Created attachment 245083 the patch 1063193 3 245083 commit-queue 2015-01-21 14:51:43 -0800 Comment on attachment 245083 the patch Clearing flags on attachment: 245083 Committed r178863: <http://trac.webkit.org/changeset/178863> 1063194 4 commit-queue 2015-01-21 14:51:46 -0800 All reviewed patches have been landed. Closing bug. 245083 2015-01-21 13:57:14 -0800 2015-01-21 14:51:43 -0800 the patch patch.diff text/plain 3246 saam SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTc4ODU1KQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE1LTAxLTIxICBTYWFtIEJhcmF0aSAgPHNhYW1iYXJhdGkxQGdtYWlsLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBEb24ndCBhbGxvdyB0aGUgQmFzaWNCbG9ja0Fubm90YXRvciB0 byBoaWdobGlnaHQgYSBzZWN0aW9uIGlmIGl0J3Mgb25seSBhIGNsb3NpbmcgYnJhY2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDcyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9CYXNpY0Jsb2NrQW5ub3RhdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkJhc2ljQmxvY2tBbm5vdGF0b3IucHJvdG90eXBlLnNldCBfaGlnaGxpZ2h0VGV4dEZvckJh c2ljQmxvY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2ljQmxvY2tBbm5vdGF0b3IucHJv dG90eXBlLl9pc1RleHRSYW5nZU9ubHlDbG9zaW5nQnJhY2UpOgorICAgICAgICBCYXNpY0Jsb2Nr QW5ub3RhdG9yIHRyaWVzIHRvIG5vIGxvbmdlciBoaWdobGlnaHQgYSBiYXNpYyBibG9jayBpZiBp dCBpcyBvbmx5CisgICAgICAgIHdoaXRlc3BhY2UgYW5kIGEgY2xvc2luZyBicmFjZS4gVGhlc2Ug cmFuZ2VzIGFyZSBvZnRlbiBhZnRlciBzdGF0ZW1lbnRzCisgICAgICAgIHRoYXQgbWFrZSB0aGVz ZSBiYXNpYyBibG9ja3MgdW5yZWFjaGFibGUsIHN1Y2ggYXMgYSByZXR1cm4vYnJlYWsvY29udGlu dWUKKyAgICAgICAgc3RhdGVtZW50IG9jY3VycmluZyBpbnNpZGUgYSBpZi9lbHNlL3doaWxlL2Zv ciBibG9jay4gVGhpcyBjaGVjayB3b24ndAorICAgICAgICBtYXRjaCBldmVyeSBoaWdobGlnaHRl ZCBlbXB0eSBjbG9zaW5nIGJyYWNlLCBidXQgY2F0Y2hlcyBtb3N0IG9mIHRoZW0gCisgICAgICAg IGJlY2F1c2UgaXQgb25seSBkb2VzIGludHJhIGJsb2NrIGFuYWx5c2lzIGluc3RlYWQgb2YgaW50 ZXIgYmxvY2sgYW5hbHlzaXMuCisKIDIwMTUtMDEtMjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVc2Ugc3ByZWFkIG9wZXJh dG9yIGluIGEgZmV3IHBsYWNlcwpJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQmFzaWNCbG9ja0Fubm90YXRvci5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9CYXNpY0Jsb2Nr QW5ub3RhdG9yLmpzCShyZXZpc2lvbiAxNzg4MjMpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9CYXNpY0Jsb2NrQW5ub3RhdG9yLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0xMDIsNyArMTAyLDcgQEAgV2ViSW5zcGVjdG9yLkJhc2ljQmxvY2tBbm5vdGF0 b3IucHJvdG90eQogICAgICAgICB2YXIgc3RhcnRQb3NpdGlvbiA9IHRoaXMuc291cmNlQ29kZVRl eHRFZGl0b3Iub3JpZ2luYWxPZmZzZXRUb0N1cnJlbnRQb3NpdGlvbihiYXNpY0Jsb2NrLnN0YXJ0 T2Zmc2V0KTsKICAgICAgICAgdmFyIGVuZFBvc2l0aW9uID0gdGhpcy5zb3VyY2VDb2RlVGV4dEVk aXRvci5vcmlnaW5hbE9mZnNldFRvQ3VycmVudFBvc2l0aW9uKGJhc2ljQmxvY2suZW5kT2Zmc2V0 KTsKIAotICAgICAgICBpZiAodGhpcy5faXNUZXh0UmFuZ2VPbmx5V2hpdGVzcGFjZShzdGFydFBv c2l0aW9uLCBlbmRQb3NpdGlvbikpCisgICAgICAgIGlmICh0aGlzLl9pc1RleHRSYW5nZU9ubHlX aGl0ZXNwYWNlKHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uKSB8fCB0aGlzLl9pc1RleHRSYW5n ZU9ubHlDbG9zaW5nQnJhY2Uoc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24pKQogICAgICAgICAg ICAgcmV0dXJuIG51bGw7CiAKICAgICAgICAgLy8gR3JheSBvdXQgdGhlIHRleHQgcmFuZ2UuCkBA IC0xMjEsNiArMTIxLDcgQEAgV2ViSW5zcGVjdG9yLkJhc2ljQmxvY2tBbm5vdGF0b3IucHJvdG90 eQogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB2YXIgZW5kTGluZVN0YXJ0UG9zaXRpb24g PSB7bGluZTogZW5kUG9zaXRpb24ubGluZSwgY2g6IDB9OworICAgICAgICAgICAgIAogICAgICAg ICAgICAgaWYgKHRoaXMuX2NhbkdyYXlPdXRFbnRpcmVMaW5lKGVuZFBvc2l0aW9uLmxpbmUsIGVu ZExpbmVTdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbikpIHsKICAgICAgICAgICAgICAgICB0aGlz Ll9ncmF5T3V0TGluZShlbmRQb3NpdGlvbi5saW5lKTsKICAgICAgICAgICAgICAgICBsaW5lU3R5 bGVzLnB1c2goe2xpbmU6IGVuZFBvc2l0aW9uLmxpbmUsIGNsYXNzTmFtZTogV2ViSW5zcGVjdG9y LkJhc2ljQmxvY2tBbm5vdGF0b3IuSGFzTm90RXhlY3V0ZWRDbGFzc05hbWV9KTsKQEAgLTE1OSw2 ICsxNjAsMTIgQEAgV2ViSW5zcGVjdG9yLkJhc2ljQmxvY2tBbm5vdGF0b3IucHJvdG90eQogICAg ICAgICByZXR1cm4gaXNPbmx5V2hpdGVzcGFjZS50ZXN0KHRoaXMuc291cmNlQ29kZVRleHRFZGl0 b3IuZ2V0VGV4dEluUmFuZ2Uoc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24pKTsKICAgICB9LAog CisgICAgX2lzVGV4dFJhbmdlT25seUNsb3NpbmdCcmFjZTogZnVuY3Rpb24oc3RhcnRQb3NpdGlv biwgZW5kUG9zaXRpb24pCisgICAgeworICAgICAgICB2YXIgaXNPbmx5Q2xvc2luZ0JyYWNlID0g L15ccypcfSQvOworICAgICAgICByZXR1cm4gaXNPbmx5Q2xvc2luZ0JyYWNlLnRlc3QodGhpcy5z b3VyY2VDb2RlVGV4dEVkaXRvci5nZXRUZXh0SW5SYW5nZShzdGFydFBvc2l0aW9uLCBlbmRQb3Np dGlvbikpOworICAgIH0sCisKICAgICBfY2FuR3JheU91dEVudGlyZUxpbmU6IGZ1bmN0aW9uKGxp bmVOdW1iZXIsIHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uKQogICAgIHsKICAgICAgICAgY29u c29sZS5hc3NlcnQoc3RhcnRQb3NpdGlvbi5saW5lID09PSBlbmRQb3NpdGlvbi5saW5lKTsK