Merge from tracemonkey

2010-05-11 00:41:08 -07:00
parent 3e3f07d8af a8480b66bc
commit e232c69abb
2816 changed files with 140436 additions and 102606 deletions
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -122,7 +122,7 @@ typedef enum JSOp {

 #define JOF_SHARPSLOT    (1U<<24) /* first immediate is uint16 stack slot no.
                                     that needs fixup when in global code (see
-                                     JSCompiler::compileScript) */
+                                     Compiler::compileScript) */

 /* Shorthands for type from format and type from opcode. */
 #define JOF_TYPE(fmt)   ((fmt) & JOF_TYPEMASK)