Please merge revisions 3fa0cae & b837d63 into stable channel

[sigmundch]

@whesse @mit-mit @kasperl

This is to fix a crash in dart2js related to js-interop (issue #24974)

This requires 2 cherry-picks:

• 3fa0cae (most of the change)
• b837d63 (a follow up fix)

Note this doesn't merge cleanly. I created CL 1485823004 with all the necessary changes. In particular,

• the first merge has a conflict, to resolve I had to delete the conflicting lines (conflict was a modify-vs-delete)
• Some APIs changed since the stable channel was cut, I changed the code where the API was different. These API changes are the diff between patchset 1 and patchset 2 of the attached CL.

[sigmundch]

It seems we need this merged to the dev channel as well. I haven't tested if it merges cleanly yet, if it doesn't, most likely the fixes are the same than those needed in the stable channel.

[whesse]

We are still doing full pushes to dev channel, so it won't need a merge.
On Dec 3, 2015 6:56 PM, "sigmundch" [email protected] wrote:

It seems we need this merged to the dev channel as well. I haven't tested
if it merges cleanly yet, if it doesn't, most likely the fixes are the same
than those needed in the stable channel.

—
Reply to this email directly or view it on GitHub
#25068 (comment).

[sigmundch]

ah ok - FWIW, there was no conflict for dev channel: I was able to cherry-pick both changes without a problem.

[whesse]

Merged in 1.13.1