diff --git a/js/js2/icodegenerator.cpp b/js/js2/icodegenerator.cpp index dc9352645380..02a85c380be0 100644 --- a/js/js2/icodegenerator.cpp +++ b/js/js2/icodegenerator.cpp @@ -107,7 +107,7 @@ JSType *ICodeGenerator::findType(const StringAtom& typeName) variables' declarations are encountered. This wouldn't be necessary if a function presented a list of all variables, or a pre-pass executed to discover same. */ -TypedRegister ICodeGenerator::allocateRegister(const StringAtom& name, JSType *type) +TypedRegister ICodeGenerator::allocateRegister(JSType *type) { Register r = mTopRegister; while (r < mPermanentRegister.size()) @@ -2332,7 +2332,7 @@ TypedRegister ICodeGenerator::genStmt(StmtNode *p, LabelSet *currentLabelSet) while (c) { // Bind the incoming exception ... if (mExceptionRegister.first == NotABanana) - mExceptionRegister = allocateRegister(mContext->getWorld().identifiers["__exceptionObject__"], &Any_Type); + mExceptionRegister = allocateRegister(&Any_Type); genStmt(c->stmt); if (finallyLabel) diff --git a/js/js2/icodegenerator.h b/js/js2/icodegenerator.h index 69abe8984e36..27585f63d539 100644 --- a/js/js2/icodegenerator.h +++ b/js/js2/icodegenerator.h @@ -235,7 +235,7 @@ namespace ICG { void resetTopRegister() { mTopRegister = 0; } void resetStatement() { resetTopRegister(); } - TypedRegister allocateRegister(const StringAtom& name, JSType *type); + TypedRegister allocateRegister(JSType *type); JSType *findType(const StringAtom& typeName); @@ -320,7 +320,7 @@ namespace ICG { TypedRegister allocateVariable(const StringAtom& name, JSType *type) { - TypedRegister r = allocateRegister(name, type); + TypedRegister r = allocateRegister(type); variableList->add(name, r); return r; } @@ -337,7 +337,7 @@ namespace ICG { TypedRegister allocateParameter(const StringAtom& name, bool isOptional, JSType *type) { - TypedRegister r = allocateRegister(name, type); + TypedRegister r = allocateRegister(type); parameterList->add(name, r, isOptional); return r; } diff --git a/js2/src/icodegenerator.cpp b/js2/src/icodegenerator.cpp index dc9352645380..02a85c380be0 100644 --- a/js2/src/icodegenerator.cpp +++ b/js2/src/icodegenerator.cpp @@ -107,7 +107,7 @@ JSType *ICodeGenerator::findType(const StringAtom& typeName) variables' declarations are encountered. This wouldn't be necessary if a function presented a list of all variables, or a pre-pass executed to discover same. */ -TypedRegister ICodeGenerator::allocateRegister(const StringAtom& name, JSType *type) +TypedRegister ICodeGenerator::allocateRegister(JSType *type) { Register r = mTopRegister; while (r < mPermanentRegister.size()) @@ -2332,7 +2332,7 @@ TypedRegister ICodeGenerator::genStmt(StmtNode *p, LabelSet *currentLabelSet) while (c) { // Bind the incoming exception ... if (mExceptionRegister.first == NotABanana) - mExceptionRegister = allocateRegister(mContext->getWorld().identifiers["__exceptionObject__"], &Any_Type); + mExceptionRegister = allocateRegister(&Any_Type); genStmt(c->stmt); if (finallyLabel) diff --git a/js2/src/icodegenerator.h b/js2/src/icodegenerator.h index 69abe8984e36..27585f63d539 100644 --- a/js2/src/icodegenerator.h +++ b/js2/src/icodegenerator.h @@ -235,7 +235,7 @@ namespace ICG { void resetTopRegister() { mTopRegister = 0; } void resetStatement() { resetTopRegister(); } - TypedRegister allocateRegister(const StringAtom& name, JSType *type); + TypedRegister allocateRegister(JSType *type); JSType *findType(const StringAtom& typeName); @@ -320,7 +320,7 @@ namespace ICG { TypedRegister allocateVariable(const StringAtom& name, JSType *type) { - TypedRegister r = allocateRegister(name, type); + TypedRegister r = allocateRegister(type); variableList->add(name, r); return r; } @@ -337,7 +337,7 @@ namespace ICG { TypedRegister allocateParameter(const StringAtom& name, bool isOptional, JSType *type) { - TypedRegister r = allocateRegister(name, type); + TypedRegister r = allocateRegister(type); parameterList->add(name, r, isOptional); return r; }