From a47d1e3bc835d5fb1c8afe84efef6c2eacf620fb Mon Sep 17 00:00:00 2001 From: Volker Berlin Date: Sat, 10 Jul 2021 22:30:53 +0200 Subject: [PATCH] reduce compiler warnings --- .../jwebassembly/module/WasmCodeBuilder.java | 1 + .../module/nativecode/ReplacementForArray.java | 2 +- .../module/nativecode/ReplacementForClass.java | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java b/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java index b24008a..ec2b786 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java @@ -608,6 +608,7 @@ public abstract class WasmCodeBuilder { * * @param name * the function name that should be called + * @param needThisParameter true, if the hidden THIS parameter is needed, If it is an instance method call. * @param javaCodePos * the code position/offset in the Java method * @param lineNumber diff --git a/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForArray.java b/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForArray.java index b46b0a6..a211ad2 100644 --- a/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForArray.java +++ b/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForArray.java @@ -98,7 +98,7 @@ public class ReplacementForArray { * @return the length of the object */ @Replace( "java/lang/reflect/Array.newInstance(Ljava/lang/Class;I)Ljava/lang/Object;" ) - private static Object array_newInstance( ReplacementForClass componentClass, int length ) { + private static Object array_newInstance( ReplacementForClass componentClass, int length ) { int vtable = componentClass.vtable; int componentType = getIntFromMemory( vtable + TYPE_DESCRIPTION_INSTANCEOF_OFFSET ); switch( componentType ) { diff --git a/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForClass.java b/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForClass.java index 9b90c36..f46389d 100644 --- a/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForClass.java +++ b/src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForClass.java @@ -88,7 +88,7 @@ class ReplacementForClass { + "return " // ) @Replace( "java/lang/Object.getClass()Ljava/lang/Class;" ) - private static native ReplacementForClass getClassObject( Object obj ); + private static native ReplacementForClass getClassObject( Object obj ); /** * WASM code @@ -100,8 +100,8 @@ class ReplacementForClass { * @return the string * @see TypeManager#getClassConstantFunction() */ - private static ReplacementForClass classConstant( int classIdx ) { - ReplacementForClass clazz = getClassFromTable( classIdx ); + private static ReplacementForClass classConstant( int classIdx ) { + ReplacementForClass clazz = getClassFromTable( classIdx ); if( clazz != null ) { return clazz; } @@ -117,7 +117,7 @@ class ReplacementForClass { └──────────────────────────────────┘ */ int vtable = getIntFromMemory( classIdx * 4 + typeTableMemoryOffset() ); - clazz = new ReplacementForClass( vtable, classIdx ); + clazz = new ReplacementForClass<>( vtable, classIdx ); // save the string for future use setClassIntoTable( classIdx, clazz ); return clazz; @@ -135,7 +135,7 @@ class ReplacementForClass { @WasmTextCode( "local.get 0 " + // "table.get 2 " + // table 2 is used for classes "return" ) - private static native ReplacementForClass getClassFromTable( int classIdx ); + private static native ReplacementForClass getClassFromTable( int classIdx ); /** * WASM code @@ -151,7 +151,7 @@ class ReplacementForClass { "local.get 1 " + // "table.set 2 " + // table 2 is used for classes "return" ) - private static native void setClassIntoTable( int strIdx, ReplacementForClass clazz ); + private static native void setClassIntoTable( int strIdx, ReplacementForClass clazz ); /** * WASM code