Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Closure object with FunctionObject clone

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@52756 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
1999-11-03 23:59:35 +00:00
parent 74b9419214
commit ec90446de8
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java
View File

@@ -1878,16 +1878,7 @@ public class Codegen extends Interpreter {
}
private void visitFunction(Node node) {
addByteCode(ByteCode.NEW, "org/mozilla/javascript/NativeClosure");
addByteCode(ByteCode.DUP);
// Context argument to constructor
aload(contextLocal);
// Scope argument to constructor
aload(variableObjectLocal);
// Function argument to constructor
Node fn = (Node) node.getProp(Node.FUNCTION_PROP);
Short index = (Short) fn.getProp(Node.FUNCTION_PROP);
aload(funObjLocal);
@@ -1895,12 +1886,14 @@ public class Codegen extends Interpreter {
"nestedFunctions", "[Lorg/mozilla/javascript/NativeFunction;");
push(index.shortValue());
addByteCode(ByteCode.AALOAD);
addVirtualInvoke("java/lang/Object", "getClass", "()", "Ljava/lang/Class;");
aload(contextLocal);
addScriptRuntimeInvoke("createFunctionObject",
"(Lorg/mozilla/javascript/Scriptable;"+
"Ljava/lang/Class;" +
"Lorg/mozilla/javascript/Context;)",
"Lorg/mozilla/javascript/NativeFunction;");
addSpecialInvoke("org/mozilla/javascript/NativeClosure",
"<init>",
"(Lorg/mozilla/javascript/Context;" +
"Lorg/mozilla/javascript/Scriptable;" +
"Lorg/mozilla/javascript/NativeFunction;)", "V");
}
private void visitTarget(Node node) {

21
mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
View File

@@ -1878,16 +1878,7 @@ public class Codegen extends Interpreter {
}
private void visitFunction(Node node) {
addByteCode(ByteCode.NEW, "org/mozilla/javascript/NativeClosure");
addByteCode(ByteCode.DUP);
// Context argument to constructor
aload(contextLocal);
// Scope argument to constructor
aload(variableObjectLocal);
// Function argument to constructor
Node fn = (Node) node.getProp(Node.FUNCTION_PROP);
Short index = (Short) fn.getProp(Node.FUNCTION_PROP);
aload(funObjLocal);
@@ -1895,12 +1886,14 @@ public class Codegen extends Interpreter {
"nestedFunctions", "[Lorg/mozilla/javascript/NativeFunction;");
push(index.shortValue());
addByteCode(ByteCode.AALOAD);
addVirtualInvoke("java/lang/Object", "getClass", "()", "Ljava/lang/Class;");
aload(contextLocal);
addScriptRuntimeInvoke("createFunctionObject",
"(Lorg/mozilla/javascript/Scriptable;"+
"Ljava/lang/Class;" +
"Lorg/mozilla/javascript/Context;)",
"Lorg/mozilla/javascript/NativeFunction;");
addSpecialInvoke("org/mozilla/javascript/NativeClosure",
"<init>",
"(Lorg/mozilla/javascript/Context;" +
"Lorg/mozilla/javascript/Scriptable;" +
"Lorg/mozilla/javascript/NativeFunction;)", "V");
}
private void visitTarget(Node node) {