1340589 - js::Disassemble1 ignores script->mainOffset() while checking JSTRY_CATCH start

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Tooru Fujisawa [:arai]]

code:
  disfile("a.js")

a.js:
  var x, y;
  try {} catch (e) {}

actual result:
  there's no catch offset next to "try" opcode

expected result:
  "try" opcode has catch offset

patch is coming.

Comment 1

[Tooru Fujisawa [:arai]]

Attachment: Use Jsscript::mainOffset() while checking JSTRY_CATCH in dis() output.

mainOffset can be non-zero for top level code, so note.start is based on mainOffset.
so Disassemble1 should use mainOffset value while comparing note.start against PC offset.

Comment 2

[Luke Wagner [:luke]]

Comment on attachment 8838601 [details] [diff] [review]
Use Jsscript::mainOffset() while checking JSTRY_CATCH in dis() output.

Review of attachment 8838601 [details] [diff] [review]:
-----------------------------------------------------------------

Whoa, tricky.

Comment 3

[Tooru Fujisawa [:arai]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e319d3fd614a71056cce9deb07a530abe825bfba
Bug 1340589 - Use JSScript::mainOffset() while checking JSTRY_CATCH in dis() output. r=luke

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/e319d3fd614a