Bug 487251 - imacros.c.out generation fails: Error: .igroup/.end name mismatch (r=mrbkap).
authorBrendan Eich <brendan@mozilla.org>
Tue, 07 Apr 2009 13:30:59 -0700
changeset 27048 10bf357feece19de25b861383c2a99a798bbcf71
parent 27047 05912e32cbb3b2d9997736f45dcb2b8e6e571de5
child 27049 9d83ce1fb4b3d06bd10afef5125e8c098d84ab1d
push id6362
push userbrendan@mozilla.com
push dateTue, 07 Apr 2009 20:31:21 +0000
treeherdermozilla-central@10bf357feece [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs487251
milestone1.9.2a1pre
Bug 487251 - imacros.c.out generation fails: Error: .igroup/.end name mismatch (r=mrbkap).
js/src/imacros.jsasm
--- a/js/src/imacros.jsasm
+++ b/js/src/imacros.jsasm
@@ -313,17 +313,17 @@ 2:      pop                             
         primtop                             # String this rval
         goto 4                              # String this rval
 3:      swap                                # String this rval obj
         pop                                 # String this rval
 4:      call 1                              # str
         stop                                # str
     .end
 
-.end
+.end call
 
 .igroup new JSOP_NEW
 
     .imacro String                          # String this obj
         dup                                 # String this obj obj
         dup                                 # String this obj obj obj
         getprop toString                    # String this obj obj toString
         ifprimtop 1                         # String this obj obj toString
@@ -339,17 +339,17 @@ 2:      pop                             
         primtop                             # String this rval
         goto 4                              # String this rval
 3:      swap                                # String this rval obj
         pop                                 # String this rval
 4:      new 1                               # strobj
         stop                                # strobj
     .end
 
-.end call
+.end new
 
 .igroup apply JSOP_APPLY
 
     .imacro apply0                          # apply fun this arr
         pick 3                              # fun this arr apply
         pop                                 # fun this arr
         pop                                 # fun this
         call 0                              #
@@ -707,17 +707,17 @@ 4:      new 1                           
     .imacro getelem                                 # obj i
         swap                                        # i obj
         callbuiltin (JSBUILTIN_GetElement)          # i fun obj
         pick 2                                      # fun obj i
         call 1                                      # propval
         stop
     .end
 
-.end
+.end getelem
 
 .igroup callelem JSOP_CALLELEM
 
     .imacro callprop                                # obj name
         swap                                        # name obj
         dup                                         # name obj obj
         callbuiltin (JSBUILTIN_GetProperty)         # name obj fun obj
         pick 3                                      # obj fun obj name
@@ -731,17 +731,17 @@ 4:      new 1                           
         dup                                         # i obj obj
         callbuiltin (JSBUILTIN_GetElement)          # i obj fun obj
         pick 3                                      # obj fun obj i
         call 1                                      # obj propval
         swap                                        # propval obj
         stop
     .end
 
-.end getelem
+.end callelem
 
 .igroup setelem JSOP_SETELEM
 
     .imacro setprop                                 # obj name val
         dup                                         # obj name val val
         pick 3                                      # name val val obj
         callbuiltin (JSBUILTIN_SetProperty)         # name val val fun obj
         pick 4                                      # val val fun obj name