Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to MemberBox #438

Merged
merged 1 commit into from
May 15, 2018
Merged

Improvements to MemberBox #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/org/mozilla/javascript/FunctionObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public FunctionObject(String name, Member methodOrConstructor,
}
String methodName = member.getName();
this.functionName = name;
Class<?>[] types = member.argTypes;
Class<?>[] types = member.argTypes();
int arity = types.length;
if (arity == 4 && (types[1].isArray() || types[2].isArray())) {
// Either variable args or an error.
Expand Down Expand Up @@ -134,8 +134,7 @@ public FunctionObject(String name, Member methodOrConstructor,
}

if (member.isMethod()) {
Method method = member.method();
Class<?> returnType = method.getReturnType();
Class<?> returnType = member.getReturnType();
if (returnType == Void.TYPE) {
hasVoidReturn = true;
} else {
Expand Down Expand Up @@ -235,13 +234,9 @@ public String getFunctionName()
/**
* Get Java method or constructor this function represent.
*/
public Member getMethodOrConstructor()
public Executable getMethodOrConstructor()
{
if (member.isMethod()) {
return member.method();
} else {
return member.ctor();
}
return member.member();
}

static Method findSingleMethod(Method[] methods, String name)
Expand Down Expand Up @@ -506,15 +501,14 @@ private void readObject(ObjectInputStream in)
{
in.defaultReadObject();
if (parmsLength > 0) {
Class<?>[] types = member.argTypes;
Class<?>[] types = member.argTypes();
typeTags = new byte[parmsLength];
for (int i = 0; i != parmsLength; ++i) {
typeTags[i] = (byte)getTypeTag(types[i]);
}
}
if (member.isMethod()) {
Method method = member.method();
Class<?> returnType = method.getReturnType();
Class<?> returnType = member.getReturnType();
if (returnType == Void.TYPE) {
hasVoidReturn = true;
} else {
Expand Down
18 changes: 9 additions & 9 deletions src/org/mozilla/javascript/JavaMembers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Object get(Scriptable scope, String name, Object javaObject,
if (bp.getter == null)
return Scriptable.NOT_FOUND;
rval = bp.getter.invoke(javaObject, Context.emptyArgs);
type = bp.getter.method().getReturnType();
type = bp.getter.getReturnType();
} else {
Field field = (Field) member;
rval = field.get(isStatic ? null : javaObject);
Expand Down Expand Up @@ -123,7 +123,7 @@ void put(Scriptable scope, String name, Object javaObject,
// main setter. Otherwise, let the NativeJavaMethod decide which
// setter to use:
if (bp.setters == null || value == null) {
Class<?> setType = bp.setter.argTypes[0];
Class<?> setType = bp.setter.argTypes()[0];
Object[] args = { Context.jsToJava(value, setType) };
try {
bp.setter.invoke(javaObject, args);
Expand Down Expand Up @@ -239,7 +239,7 @@ private MemberBox findExplicitFunction(String name, boolean isStatic)

if (methodsOrCtors != null) {
for (MemberBox methodsOrCtor : methodsOrCtors) {
Class<?>[] type = methodsOrCtor.argTypes;
Class<?>[] type = methodsOrCtor.argTypes();
String sig = liveConnectSignature(type);
if (sigStart + sig.length() == name.length()
&& name.regionMatches(sigStart, sig, 0, sig.length()))
Expand Down Expand Up @@ -602,7 +602,7 @@ private void reflect(Scriptable scope,
if (getter != null) {
// We have a getter. Now, do we have a matching
// setter?
Class<?> type = getter.method().getReturnType();
Class<?> type = getter.getReturnType();
setter = extractSetMethod(type, njmSet.methods,
isStatic);
} else {
Expand Down Expand Up @@ -713,8 +713,8 @@ private static MemberBox extractGetMethod(MemberBox[] methods,
for (MemberBox method : methods) {
// Does getter method have an empty parameter list with a return
// value (eg. a getSomething() or isSomething())?
if (method.argTypes.length == 0 && (!isStatic || method.isStatic())) {
Class<?> type = method.method().getReturnType();
if (method.member().getParameterCount() == 0 && (!isStatic || method.isStatic())) {
Class<?> type = method.getReturnType();
if (type != Void.TYPE) {
return method;
}
Expand All @@ -738,7 +738,7 @@ private static MemberBox extractSetMethod(Class<?> type, MemberBox[] methods,
for (int pass = 1; pass <= 2; ++pass) {
for (MemberBox method : methods) {
if (!isStatic || method.isStatic()) {
Class<?>[] params = method.argTypes;
Class<?>[] params = method.argTypes();
if (params.length == 1) {
if (pass == 1) {
if (params[0] == type) {
Expand All @@ -763,8 +763,8 @@ private static MemberBox extractSetMethod(MemberBox[] methods,

for (MemberBox method : methods) {
if (!isStatic || method.isStatic()) {
if (method.method().getReturnType() == Void.TYPE) {
if (method.argTypes.length == 1) {
if (method.getReturnType() == Void.TYPE) {
if (method.member().getParameterCount() == 1) {
return method;
}
}
Expand Down
74 changes: 23 additions & 51 deletions src/org/mozilla/javascript/MemberBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,32 @@ final class MemberBox implements Serializable
{
static final long serialVersionUID = 6358550398665688245L;

private transient Member memberObject;
transient Class<?>[] argTypes;
transient Object delegateTo;
transient boolean vararg;
private transient Executable memberObject;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this final? I'm asking because some of the blogs talk about JVM optimizations for reflection (and MethodHandles, which we don't use yet) that only happen when they're final.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, it can't be both transient and final as then it couldn't be assigned upon deserialization.

Object delegateTo;


MemberBox(Method method)
{
init(method);
}

MemberBox(Constructor<?> constructor)
{
init(constructor);
}

private void init(Method method)
MemberBox(Executable executable)
{
this.memberObject = method;
this.argTypes = method.getParameterTypes();
this.vararg = method.isVarArgs();
this.memberObject = executable;
}

private void init(Constructor<?> constructor)
Executable member()
{
this.memberObject = constructor;
this.argTypes = constructor.getParameterTypes();
this.vararg = constructor.isVarArgs();
return memberObject;
}

Method method()
Class<?>[] argTypes()
{
return (Method)memberObject;
return memberObject.getParameterTypes();
}

Constructor<?> ctor()
Class<?> getReturnType()
{
return (Constructor<?>)memberObject;
return ((Method)memberObject).getReturnType();
}

Member member()
boolean vararg()
{
return memberObject;
return memberObject.isVarArgs();
}

boolean isMethod()
Expand Down Expand Up @@ -95,20 +78,18 @@ String toJavaDeclaration()
{
StringBuilder sb = new StringBuilder();
if (isMethod()) {
Method method = method();
sb.append(method.getReturnType());
sb.append(getReturnType());
sb.append(' ');
sb.append(method.getName());
sb.append(memberObject.getName());
} else {
Constructor<?> ctor = ctor();
String name = ctor.getDeclaringClass().getName();
String name = memberObject.getDeclaringClass().getName();
int lastDot = name.lastIndexOf('.');
if (lastDot >= 0) {
name = name.substring(lastDot + 1);
}
sb.append(name);
}
sb.append(JavaMembers.liveConnectSignature(argTypes));
sb.append(JavaMembers.liveConnectSignature(argTypes()));
return sb.toString();
}

Expand All @@ -120,12 +101,12 @@ public String toString()

Object invoke(Object target, Object[] args)
{
Method method = method();
Method method = (Method)memberObject;
try {
try {
return method.invoke(target, args);
} catch (IllegalAccessException ex) {
Method accessible = searchAccessibleMethod(method, argTypes);
Method accessible = searchAccessibleMethod(method, argTypes());
if (accessible != null) {
memberObject = accessible;
method = accessible;
Expand Down Expand Up @@ -153,7 +134,7 @@ Object invoke(Object target, Object[] args)

Object newInstance(Object[] args)
{
Constructor<?> ctor = ctor();
Constructor<?> ctor = (Constructor<?>)memberObject;
try {
try {
return ctor.newInstance(args);
Expand Down Expand Up @@ -210,12 +191,7 @@ private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException
{
in.defaultReadObject();
Member member = readMember(in);
if (member instanceof Method) {
init((Method)member);
} else {
init((Constructor<?>)member);
}
memberObject = readMember(in);
}

private void writeObject(ObjectOutputStream out)
Expand All @@ -232,7 +208,7 @@ private void writeObject(ObjectOutputStream out)
* information about the class, the name, and the parameters and
* recreate upon deserialization.
*/
private static void writeMember(ObjectOutputStream out, Member member)
private static void writeMember(ObjectOutputStream out, Executable member)
throws IOException
{
if (member == null) {
Expand All @@ -245,17 +221,13 @@ private static void writeMember(ObjectOutputStream out, Member member)
out.writeBoolean(member instanceof Method);
out.writeObject(member.getName());
out.writeObject(member.getDeclaringClass());
if (member instanceof Method) {
writeParameters(out, ((Method) member).getParameterTypes());
} else {
writeParameters(out, ((Constructor<?>) member).getParameterTypes());
}
writeParameters(out, member.getParameterTypes());
}

/**
* Reads a Method or a Constructor from the stream.
*/
private static Member readMember(ObjectInputStream in)
private static Executable readMember(ObjectInputStream in)
throws IOException, ClassNotFoundException
{
if (!in.readBoolean())
Expand Down
4 changes: 2 additions & 2 deletions src/org/mozilla/javascript/NativeJavaClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ static Scriptable constructSpecific(Context cx, Scriptable scope,

static Object constructInternal(Object[] args, MemberBox ctor)
{
Class<?>[] argTypes = ctor.argTypes;
Class<?>[] argTypes = ctor.argTypes();

if (ctor.vararg) {
if (ctor.vararg()) {
// marshall the explicit parameter
Object[] newArgs = new Object[argTypes.length];
for (int i = 0; i < argTypes.length-1; i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/mozilla/javascript/NativeJavaConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj,
@Override
public String getFunctionName()
{
String sig = JavaMembers.liveConnectSignature(ctor.argTypes);
String sig = JavaMembers.liveConnectSignature(ctor.argTypes());
return "<init>".concat(sig);
}

Expand Down
36 changes: 18 additions & 18 deletions src/org/mozilla/javascript/NativeJavaMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ public String toString()
StringBuilder sb = new StringBuilder();
for (int i = 0, N = methods.length; i != N; ++i) {
// Check member type, we also use this for overloaded constructors
if (methods[i].isMethod()) {
Method method = methods[i].method();
sb.append(JavaMembers.javaSignature(method.getReturnType()));
MemberBox member = methods[i];
if (member.isMethod()) {
sb.append(JavaMembers.javaSignature(member.getReturnType()));
sb.append(' ');
sb.append(method.getName());
sb.append(member.getName());
} else {
sb.append(methods[i].getName());
sb.append(member.getName());
}
sb.append(JavaMembers.liveConnectSignature(methods[i].argTypes));
sb.append(JavaMembers.liveConnectSignature(member.argTypes()));
sb.append('\n');
}
return sb.toString();
Expand All @@ -138,16 +138,16 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj,

int index = findCachedFunction(cx, args);
if (index < 0) {
Class<?> c = methods[0].method().getDeclaringClass();
Class<?> c = methods[0].member().getDeclaringClass();
String sig = c.getName() + '.' + getFunctionName() + '(' +
scriptSignature(args) + ')';
throw Context.reportRuntimeError1("msg.java.no_such_method", sig);
}

MemberBox meth = methods[index];
Class<?>[] argTypes = meth.argTypes;
Class<?>[] argTypes = meth.argTypes();

if (meth.vararg) {
if (meth.vararg()) {
// marshall the explicit parameters
Object[] newArgs = new Object[argTypes.length];
for (int i = 0; i < argTypes.length-1; i++) {
Expand Down Expand Up @@ -223,7 +223,7 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj,
}

Object retval = meth.invoke(javaObject, args);
Class<?> staticType = meth.method().getReturnType();
Class<?> staticType = meth.getReturnType();

if (debug) {
Class<?> actualType = (retval == null) ? null
Expand Down Expand Up @@ -287,10 +287,10 @@ static int findFunction(Context cx,
return -1;
} else if (methodsOrCtors.length == 1) {
MemberBox member = methodsOrCtors[0];
Class<?>[] argTypes = member.argTypes;
Class<?>[] argTypes = member.argTypes();
int alength = argTypes.length;

if (member.vararg) {
if (member.vararg()) {
alength--;
if ( alength > args.length) {
return -1;
Expand Down Expand Up @@ -318,9 +318,9 @@ static int findFunction(Context cx,
search:
for (int i = 0; i < methodsOrCtors.length; i++) {
MemberBox member = methodsOrCtors[i];
Class<?>[] argTypes = member.argTypes;
Class<?>[] argTypes = member.argTypes();
int alength = argTypes.length;
if (member.vararg) {
if (member.vararg()) {
alength--;
if ( alength > args.length) {
continue search;
Expand Down Expand Up @@ -370,9 +370,9 @@ static int findFunction(Context cx,
++worseCount;
} else {
int preference = preferSignature(args, argTypes,
member.vararg,
bestFit.argTypes,
bestFit.vararg );
member.vararg(),
bestFit.argTypes(),
bestFit.vararg() );
if (preference == PREFERENCE_AMBIGUOUS) {
break;
} else if (preference == PREFERENCE_FIRST_ARG) {
Expand Down Expand Up @@ -547,7 +547,7 @@ private static void printDebug(String msg, MemberBox member,
if (member.isMethod()) {
sb.append(member.getName());
}
sb.append(JavaMembers.liveConnectSignature(member.argTypes));
sb.append(JavaMembers.liveConnectSignature(member.argTypes()));
sb.append(" for arguments (");
sb.append(scriptSignature(args));
sb.append(')');
Expand Down
Loading