487251 - imacros.c.out generation fails: Error: .igroup/.end name mismatch

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect, P1)

Description

[Benjamin Smedberg]

Compiling mozilla-central today, I was trying to land bug 481350, but generation of imacros.c.tmp was failing because the following output was in it:

Error: .igroup/.end name mismatch

This is x86-64, though I hope it doesn't matter.

Comment 1

[Benjamin Smedberg]

This regression on mozilla-central appears to coincide with the merge from tracemonkey which included upvar2.

Comment 2

[Brendan Eich [:brendan]]

Argh, patch applied the .end labels to the wrong unlabeled .end lines!

Comment 3

[Brendan Eich [:brendan]]

Attachment: fix

Seems Mercurial uses too little context by default, at least for imacros.jsasm (context-sensitive, so blame could go to that file -- I'm looking for a fix, not blame justice). Any way to up the default?

/be

Comment 4

[Blake Kaplan (:mrbkap) (inactive)]

Comment on attachment 371505 [details] [diff] [review]
fix

[diff]
unified = N

in your .hgrc?

Comment 5

[Brendan Eich [:brendan]]

Fixed in tm and m-c:

http://hg.mozilla.org/tracemonkey/rev/5a2b060d8c24
http://hg.mozilla.org/mozilla-central/rev/10bf357feece

/be

Comment 6

[Jason Orendorff [:jorendorff]]

(In reply to comment #4)
> [diff]
> unified = N

You probably don't want this, because it makes your MQ patches have too much context.  This causes conflicts.

I use the settings below and generate patches using `hg qdiff`.

[defaults]
diff=-U 8 -p
qdiff=-U 8

Comment 7

[Robert Sayre]

http://hg.mozilla.org/releases/mozilla-1.9.1/rev/01fbc6c89678