Skip to content

Commit ad57dc2

Browse files
committed
Added type parameters to method descriptors.
1 parent 9708c58 commit ad57dc2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/CompilerUtils.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ public static int calcAccess(int modifiers) {
4747
}
4848

4949
public static void tagMethodParameters(JavaBytecodeContext context, JavaCompiledModule module, FunctionHeader header, boolean isStatic) {
50+
int index = header.getNumberOfTypeParameters();
51+
5052
for (int i = 0; i < header.parameters.length; i++) {
5153
FunctionParameter parameter = header.parameters[i];
5254
String parameterType = context.getDescriptor(parameter.type);
53-
module.setParameterInfo(parameter, new JavaParameterInfo(isStatic ? i : i + 1, parameterType));
55+
module.setParameterInfo(parameter, new JavaParameterInfo(isStatic ? index : index + 1, parameterType));
56+
index++;
5457
}
5558
}
5659

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ public JavaSynthesizedClass getRange(RangeTypeID type) {
314314

315315
private String getMethodDescriptor(FunctionHeader header, boolean isEnumConstructor) {
316316
StringBuilder descBuilder = new StringBuilder("(");
317+
for (int i = 0; i < header.getNumberOfTypeParameters(); i++)
318+
descBuilder.append("Ljava/lang/Class;");
319+
317320
if (isEnumConstructor)
318321
descBuilder.append("Ljava/lang/String;I");
319322

0 commit comments

Comments
 (0)