diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/Main.java b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/Main.java index 5dd2b6cbc3..dcc3feb7ae 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/Main.java +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/Main.java @@ -28,6 +28,12 @@ public void method1(int i1, @JsOptional Double d, @JsOptional Integer i) {} @JsMethod public void method2(String s1, @JsOptional Double d, Boolean... i) {} + @JsMethod + public static void staticMethod1(int i1, @JsOptional Double d, @JsOptional Integer i) {} + + @JsMethod + public static void staticMethod2(String s1, @JsOptional Double d, Boolean... i) {} + @JsFunction interface Function { Object f1(@JsOptional String s, Object... args); diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.impl.java.js.txt index ed2167dcdc..1eb81de5dd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.impl.java.js.txt @@ -22,6 +22,15 @@ class Main extends j_l_Object { method2(/** ?string */ s1, /** ?number= */ d, .../** ...?boolean */ i) { $Arrays.$stampType(i, Boolean, 1); } + + static staticMethod1(/** number */ i1, /** ?number= */ d, /** Integer= */ i) { + Main.$clinit(); + } + + static staticMethod2(/** ?string */ s1, /** ?number= */ d, .../** ...?boolean */ i) { + Main.$clinit(); + $Arrays.$stampType(i, Boolean, 1); + } /** @nodts */ $ctor__jsoptional_Main__java_lang_String__void(/** ?string */ a) { this.$ctor__java_lang_Object__void(); diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.js.mappings.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.js.mappings.txt index 20402923bd..bc04dbda35 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.js.mappings.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main.js.mappings.txt @@ -16,6 +16,17 @@ [d] => [d] "d" [i] => [i] "i" [{}] => [$Arrays.$stampType(i, Boolean, 1);] "jsoptional.Main.method2" +[staticMethod1] => [staticMethod1] +[i1] => [i1] "i1" +[d] => [d] "d" +[i] => [i] "i" +[{}] => [Main.$clinit();] "jsoptional.Main.staticMethod1" +[staticMethod2] => [staticMethod2] +[s1] => [s1] "s1" +[d] => [d] "d" +[i] => [i] "i" +[{}] => [Main.$clinit();] "jsoptional.Main.staticMethod2" +[{}] => [$Arrays.$stampType(i, Boolean, 1);] "jsoptional.Main.staticMethod2" [Main] => [$ctor__jsoptional_Main__java_lang_String__void] [a] => [a] "a" [{}] => [this.$ctor__java_lang_Object__void();] "jsoptional.Main." diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main+J2ObjCCompat.h.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main+J2ObjCCompat.h.txt index 7f2b6c6388..581480a58b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main+J2ObjCCompat.h.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main+J2ObjCCompat.h.txt @@ -3,12 +3,15 @@ #import @class J2ktJsoptionalMain; +@class J2ktJsoptionalMainCompanion; @class NSString; NS_ASSUME_NONNULL_BEGIN @compatibility_alias JsoptionalMain J2ktJsoptionalMain; +@compatibility_alias JsoptionalMainCompanion J2ktJsoptionalMainCompanion; + NS_INLINE J2ktJsoptionalMain* create_JsoptionalMain_initWithNSString_(NSString* _Nullable a) { return [[J2ktJsoptionalMain alloc] initWithNSString:a]; } diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main.kt.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main.kt.txt index f0c8cb8fb2..caa42fd770 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main.kt.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_kt/Main.kt.txt @@ -33,6 +33,7 @@ import kotlin.String import kotlin.Suppress import kotlin.experimental.ExperimentalObjCName import kotlin.jvm.JvmField +import kotlin.jvm.JvmStatic import kotlin.native.ObjCName @ObjCName("J2ktJsoptionalMain", exact = true) @@ -77,6 +78,29 @@ open class Main { @ObjCName("withJsoptionalMain_Function") @JsOptional f: Main.Function? ) {} + @ObjCName("J2ktJsoptionalMainCompanion", exact = true) + companion object { + @JvmStatic + @ObjCName("staticMethod1") + @JsMethod + fun staticMethod1( + @ObjCName("withInt") i1: Int, + @ObjCName("withJavaLangDouble") @JsOptional d: Double?, + @ObjCName("withJavaLangInteger") @JsOptional i: Int? + ) {} + + @JvmStatic + @ObjCName("staticMethod2") + @JsMethod + fun staticMethod2( + @ObjCName("withNSString") s1: String?, + @ObjCName("withJavaLangDouble") @JsOptional d: Double?, + vararg @ObjCName("withJavaLangBooleanArray") i: Boolean? + ) { + val i_1: Array? = i as Array? + } + } + @JsFunction fun interface Function { @ObjCName("f1") diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_wasm/module.wat.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_wasm/module.wat.txt index deb8bf5ad7..0e5221a9f7 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_wasm/module.wat.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_wasm/module.wat.txt @@ -367,16 +367,16 @@ ;;; void Function.$clinit() (func $$clinit__void@jsoptional.Main.Function - ;;@ jsoptional/Main.java:32:12 + ;;@ jsoptional/Main.java:38:12 (block - ;;@ jsoptional/Main.java:32:12 + ;;@ jsoptional/Main.java:38:12 (if (global.get $f_$initialized__jsoptional_Main_Function) (then - ;;@ jsoptional/Main.java:32:12 + ;;@ jsoptional/Main.java:38:12 (return ) ) ) - ;;@ jsoptional/Main.java:32:12 + ;;@ jsoptional/Main.java:38:12 (global.set $f_$initialized__jsoptional_Main_Function (i32.const 1)) ) ) @@ -411,16 +411,16 @@ ;;; void I.$clinit() (func $$clinit__void@jsoptional.Main.I - ;;@ jsoptional/Main.java:54:12 + ;;@ jsoptional/Main.java:60:12 (block - ;;@ jsoptional/Main.java:54:12 + ;;@ jsoptional/Main.java:60:12 (if (global.get $f_$initialized__jsoptional_Main_I) (then - ;;@ jsoptional/Main.java:54:12 + ;;@ jsoptional/Main.java:60:12 (return ) ) ) - ;;@ jsoptional/Main.java:54:12 + ;;@ jsoptional/Main.java:60:12 (global.set $f_$initialized__jsoptional_Main_I (i32.const 1)) ) ) @@ -483,18 +483,42 @@ ) (elem declare func $m_method2__java_lang_String__java_lang_Double__arrayOf_java_lang_Boolean__void@jsoptional.Main) +;;; void Main.staticMethod1(int i1, Double d, Integer i) +(func $m_staticMethod1__int__java_lang_Double__java_lang_Integer__void@jsoptional.Main + (param $i1 i32) + (param $d (ref null $java.lang.Double)) + (param $i (ref null $java.lang.Integer)) + ;;@ jsoptional/Main.java:32:21 + (block + ;;@ jsoptional/Main.java:32:88 + (call $$clinit__void@jsoptional.Main ) + ) +) + +;;; void Main.staticMethod2(String s1, Double d, Boolean... i) +(func $m_staticMethod2__java_lang_String__java_lang_Double__arrayOf_java_lang_Boolean__void@jsoptional.Main + (param $s1 (ref null $java.lang.String)) + (param $d (ref null $java.lang.Double)) + (param $i (ref null $javaemul.internal.WasmArray.OfObject)) + ;;@ jsoptional/Main.java:35:21 + (block + ;;@ jsoptional/Main.java:35:82 + (call $$clinit__void@jsoptional.Main ) + ) +) + ;;; Main Main.$create(String a) (func $$create__java_lang_String@jsoptional.Main (param $a (ref null $java.lang.String)) (result (ref null $jsoptional.Main)) - ;;@ jsoptional/Main.java:39:9 + ;;@ jsoptional/Main.java:45:9 (local $$instance (ref null $jsoptional.Main)) (block - ;;@ jsoptional/Main.java:39:9 + ;;@ jsoptional/Main.java:45:9 (local.set $$instance (struct.new $jsoptional.Main (ref.as_non_null (global.get $jsoptional.Main.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0) (ref.null $java.lang.Object))) - ;;@ jsoptional/Main.java:39:9 + ;;@ jsoptional/Main.java:45:9 (call $$ctor__java_lang_String__void_$p_jsoptional_Main@jsoptional.Main (ref.as_non_null (local.get $$instance))(local.get $a)) - ;;@ jsoptional/Main.java:39:9 + ;;@ jsoptional/Main.java:45:9 (return (local.get $$instance)) ) ) @@ -503,13 +527,13 @@ (func $$ctor__java_lang_String__void_$p_jsoptional_Main@jsoptional.Main (param $this (ref null $jsoptional.Main)) (param $a (ref null $java.lang.String)) - ;;@ jsoptional/Main.java:39:9 + ;;@ jsoptional/Main.java:45:9 (block - ;;@ jsoptional/Main.java:39:36 + ;;@ jsoptional/Main.java:45:36 (call $$clinit__void@jsoptional.Main ) - ;;@ jsoptional/Main.java:39:36 + ;;@ jsoptional/Main.java:45:36 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) - ;;@ jsoptional/Main.java:39:36 + ;;@ jsoptional/Main.java:45:36 (call $$init__void_$p_jsoptional_Main@jsoptional.Main (ref.as_non_null (local.get $this))) ) ) @@ -519,7 +543,7 @@ (type $function.m_testFunction__jsoptional_Main_Function__void) (param $this.untyped (ref $java.lang.Object)) (param $f (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:48:14 + ;;@ jsoptional/Main.java:54:14 (local $this (ref null $jsoptional.Main)) (local.set $this (ref.cast (ref $jsoptional.Main) (local.get $this.untyped))) (block @@ -532,7 +556,7 @@ (type $function.m_testOptionalFunction__jsoptional_Main_Function__void) (param $this.untyped (ref $java.lang.Object)) (param $f (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:51:14 + ;;@ jsoptional/Main.java:57:14 (local $this (ref null $jsoptional.Main)) (local.set $this (ref.cast (ref $jsoptional.Main) (local.get $this.untyped))) (block @@ -545,7 +569,7 @@ (param $this (ref null $jsoptional.Main)) ;;@ jsoptional/Main.java:24:13 (block - ;;@ jsoptional/Main.java:36:2 + ;;@ jsoptional/Main.java:42:2 (struct.set $jsoptional.Main $f_f__jsoptional_Main (local.get $this) (call $$create__@jsoptional.Main.$LambdaImplementor$1 )) ) ) @@ -612,14 +636,14 @@ ;;; implements Function implements Function.$create() (func $$create__@jsoptional.Main.$LambdaImplementor$1 (result (ref null $jsoptional.Main.$LambdaImplementor$1)) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (local $$instance (ref null $jsoptional.Main.$LambdaImplementor$1)) (block - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (local.set $$instance (struct.new $jsoptional.Main.$LambdaImplementor$1 (ref.as_non_null (global.get $jsoptional.Main.$LambdaImplementor$1.vtable)) (ref.as_non_null (global.get $jsoptional.Main.$LambdaImplementor$1.itable)) (i32.const 0))) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (call $$ctor__void_$p_jsoptional_Main_$LambdaImplementor$1@jsoptional.Main.$LambdaImplementor$1 (ref.as_non_null (local.get $$instance))) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (return (local.get $$instance)) ) ) @@ -627,11 +651,11 @@ ;;; void implements Function.$ctor() (func $$ctor__void_$p_jsoptional_Main_$LambdaImplementor$1@jsoptional.Main.$LambdaImplementor$1 (param $this (ref null $jsoptional.Main.$LambdaImplementor$1)) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (block - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (call $$clinit__void@jsoptional.Main.$LambdaImplementor$1 ) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) ) ) @@ -643,11 +667,11 @@ (param $s (ref null $java.lang.String)) (param $varargs (ref null $javaemul.internal.WasmArray.OfObject)) (result (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (local $this (ref null $jsoptional.Main.$LambdaImplementor$1)) (local.set $this (ref.cast (ref $jsoptional.Main.$LambdaImplementor$1) (local.get $this.untyped))) (block - ;;@ jsoptional/Main.java:36:31 + ;;@ jsoptional/Main.java:42:31 (return (local.get $s)) ) ) @@ -655,18 +679,18 @@ ;;; void implements Function.$clinit() (func $$clinit__void@jsoptional.Main.$LambdaImplementor$1 - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (block - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (if (global.get $f_$initialized__jsoptional_Main_$LambdaImplementor$1) (then - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (return ) ) ) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (global.set $f_$initialized__jsoptional_Main_$LambdaImplementor$1 (i32.const 1)) - ;;@ jsoptional/Main.java:36:15 + ;;@ jsoptional/Main.java:42:15 (call $$clinit__void@java.lang.Object ) ) ) @@ -715,14 +739,14 @@ ;;; AFunction AFunction.$create() (func $$create__@jsoptional.Main.AFunction (result (ref null $jsoptional.Main.AFunction)) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (local $$instance (ref null $jsoptional.Main.AFunction)) (block - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (local.set $$instance (struct.new $jsoptional.Main.AFunction (ref.as_non_null (global.get $jsoptional.Main.AFunction.vtable)) (ref.as_non_null (global.get $jsoptional.Main.AFunction.itable)) (i32.const 0))) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (call $$ctor__void_$p_jsoptional_Main_AFunction@jsoptional.Main.AFunction (ref.as_non_null (local.get $$instance))) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (return (local.get $$instance)) ) ) @@ -730,11 +754,11 @@ ;;; void AFunction.$ctor() (func $$ctor__void_$p_jsoptional_Main_AFunction@jsoptional.Main.AFunction (param $this (ref null $jsoptional.Main.AFunction)) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (block - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (call $$clinit__void@jsoptional.Main.AFunction ) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) ) ) @@ -746,11 +770,11 @@ (param $i (ref null $java.lang.String)) (param $args (ref null $javaemul.internal.WasmArray.OfObject)) (result (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:43:18 + ;;@ jsoptional/Main.java:49:18 (local $this (ref null $jsoptional.Main.AFunction)) (local.set $this (ref.cast (ref $jsoptional.Main.AFunction) (local.get $this.untyped))) (block - ;;@ jsoptional/Main.java:44:6 + ;;@ jsoptional/Main.java:50:6 (return (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $f_elements__javaemul_internal_WasmArray_OfObject (local.get $args)) (i32.const 0))) ) ) @@ -758,18 +782,18 @@ ;;; void AFunction.$clinit() (func $$clinit__void@jsoptional.Main.AFunction - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (block - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (if (global.get $f_$initialized__jsoptional_Main_AFunction) (then - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (return ) ) ) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (global.set $f_$initialized__jsoptional_Main_AFunction (i32.const 1)) - ;;@ jsoptional/Main.java:41:21 + ;;@ jsoptional/Main.java:47:21 (call $$clinit__void@java.lang.Object ) ) ) @@ -818,14 +842,14 @@ ;;; TemplatedSubtype TemplatedSubtype.$create() (func $$create__@jsoptional.Main.TemplatedSubtype (result (ref null $jsoptional.Main.TemplatedSubtype)) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (local $$instance (ref null $jsoptional.Main.TemplatedSubtype)) (block - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (local.set $$instance (struct.new $jsoptional.Main.TemplatedSubtype (ref.as_non_null (global.get $jsoptional.Main.TemplatedSubtype.vtable)) (ref.as_non_null (global.get $jsoptional.Main.TemplatedSubtype.itable)) (i32.const 0))) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (call $$ctor__void_$p_jsoptional_Main_TemplatedSubtype@jsoptional.Main.TemplatedSubtype (ref.as_non_null (local.get $$instance))) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (return (local.get $$instance)) ) ) @@ -833,11 +857,11 @@ ;;; void TemplatedSubtype.$ctor() (func $$ctor__void_$p_jsoptional_Main_TemplatedSubtype@jsoptional.Main.TemplatedSubtype (param $this (ref null $jsoptional.Main.TemplatedSubtype)) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (block - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (call $$clinit__void@jsoptional.Main.TemplatedSubtype ) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) ) ) @@ -848,7 +872,7 @@ (param $this.untyped (ref $java.lang.Object)) (param $t (ref null $java.lang.String)) (param $o (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:61:16 + ;;@ jsoptional/Main.java:67:16 (local $this (ref null $jsoptional.Main.TemplatedSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.TemplatedSubtype) (local.get $this.untyped))) (block @@ -862,11 +886,11 @@ (param $this.untyped (ref $java.lang.Object)) (param $arg0 (ref null $java.lang.Object)) (param $arg1 (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (local $this (ref null $jsoptional.Main.TemplatedSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.TemplatedSubtype) (local.get $this.untyped))) (block - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (call_ref $function.m_m__java_lang_String__java_lang_Object__void (ref.as_non_null (local.get $this))(ref.cast (ref null $java.lang.String) (local.get $arg0))(local.get $arg1)(struct.get $jsoptional.Main.TemplatedSubtype.vtable $m_m__java_lang_String__java_lang_Object__void (struct.get $jsoptional.Main.TemplatedSubtype $vtable(local.get $this)))) ) ) @@ -874,18 +898,18 @@ ;;; void TemplatedSubtype.$clinit() (func $$clinit__void@jsoptional.Main.TemplatedSubtype - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (block - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (if (global.get $f_$initialized__jsoptional_Main_TemplatedSubtype) (then - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (return ) ) ) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (global.set $f_$initialized__jsoptional_Main_TemplatedSubtype (i32.const 1)) - ;;@ jsoptional/Main.java:59:15 + ;;@ jsoptional/Main.java:65:15 (call $$clinit__void@java.lang.Object ) ) ) @@ -936,14 +960,14 @@ (param $$outer_this (ref null $jsoptional.Main)) (param $a (ref null $java.lang.Object)) (result (ref null $jsoptional.Main.SpecializedSubtype)) - ;;@ jsoptional/Main.java:68:11 + ;;@ jsoptional/Main.java:74:11 (local $$instance (ref null $jsoptional.Main.SpecializedSubtype)) (block - ;;@ jsoptional/Main.java:68:11 + ;;@ jsoptional/Main.java:74:11 (local.set $$instance (struct.new $jsoptional.Main.SpecializedSubtype (ref.as_non_null (global.get $jsoptional.Main.SpecializedSubtype.vtable)) (ref.as_non_null (global.get $jsoptional.Main.SpecializedSubtype.itable)) (i32.const 0) (ref.null $jsoptional.Main))) - ;;@ jsoptional/Main.java:68:11 + ;;@ jsoptional/Main.java:74:11 (call $$ctor__jsoptional_Main__java_lang_Object__void_$p_jsoptional_Main_SpecializedSubtype@jsoptional.Main.SpecializedSubtype (ref.as_non_null (local.get $$instance))(local.get $$outer_this)(local.get $a)) - ;;@ jsoptional/Main.java:68:11 + ;;@ jsoptional/Main.java:74:11 (return (local.get $$instance)) ) ) @@ -953,13 +977,13 @@ (param $this (ref null $jsoptional.Main.SpecializedSubtype)) (param $$outer_this (ref null $jsoptional.Main)) (param $a (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:68:11 + ;;@ jsoptional/Main.java:74:11 (block - ;;@ jsoptional/Main.java:68:52 + ;;@ jsoptional/Main.java:74:52 (call $$clinit__void@jsoptional.Main.SpecializedSubtype ) - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (struct.set $jsoptional.Main.SpecializedSubtype $$outer_this__jsoptional_Main_SpecializedSubtype (local.get $this) (local.get $$outer_this)) - ;;@ jsoptional/Main.java:68:52 + ;;@ jsoptional/Main.java:74:52 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) ) ) @@ -970,7 +994,7 @@ (param $this.untyped (ref $java.lang.Object)) (param $t (ref null $java.lang.String)) (param $o (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:71:16 + ;;@ jsoptional/Main.java:77:16 (local $this (ref null $jsoptional.Main.SpecializedSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.SpecializedSubtype) (local.get $this.untyped))) (block @@ -984,11 +1008,11 @@ (param $this.untyped (ref $java.lang.Object)) (param $arg0 (ref null $java.lang.Object)) (param $arg1 (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (local $this (ref null $jsoptional.Main.SpecializedSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.SpecializedSubtype) (local.get $this.untyped))) (block - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (call_ref $function.m_m__java_lang_String__java_lang_Object__void (ref.as_non_null (local.get $this))(ref.cast (ref null $java.lang.String) (local.get $arg0))(local.get $arg1)(struct.get $jsoptional.Main.SpecializedSubtype.vtable $m_m__java_lang_String__java_lang_Object__void (struct.get $jsoptional.Main.SpecializedSubtype $vtable(local.get $this)))) ) ) @@ -996,18 +1020,18 @@ ;;; void SpecializedSubtype.$clinit() (func $$clinit__void@jsoptional.Main.SpecializedSubtype - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (block - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (if (global.get $f_$initialized__jsoptional_Main_SpecializedSubtype) (then - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (return ) ) ) - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (global.set $f_$initialized__jsoptional_Main_SpecializedSubtype (i32.const 1)) - ;;@ jsoptional/Main.java:66:8 + ;;@ jsoptional/Main.java:72:8 (call $$clinit__void@java.lang.Object ) ) ) @@ -1056,14 +1080,14 @@ ;;; NonJsTypeSubtype NonJsTypeSubtype.$create() (func $$create__@jsoptional.Main.NonJsTypeSubtype (result (ref null $jsoptional.Main.NonJsTypeSubtype)) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (local $$instance (ref null $jsoptional.Main.NonJsTypeSubtype)) (block - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (local.set $$instance (struct.new $jsoptional.Main.NonJsTypeSubtype (ref.as_non_null (global.get $jsoptional.Main.NonJsTypeSubtype.vtable)) (ref.as_non_null (global.get $jsoptional.Main.NonJsTypeSubtype.itable)) (i32.const 0))) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (call $$ctor__void_$p_jsoptional_Main_NonJsTypeSubtype@jsoptional.Main.NonJsTypeSubtype (ref.as_non_null (local.get $$instance))) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (return (local.get $$instance)) ) ) @@ -1071,11 +1095,11 @@ ;;; void NonJsTypeSubtype.$ctor() (func $$ctor__void_$p_jsoptional_Main_NonJsTypeSubtype@jsoptional.Main.NonJsTypeSubtype (param $this (ref null $jsoptional.Main.NonJsTypeSubtype)) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (block - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (call $$clinit__void@jsoptional.Main.NonJsTypeSubtype ) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this))) ) ) @@ -1086,7 +1110,7 @@ (param $this.untyped (ref $java.lang.Object)) (param $t (ref null $java.lang.String)) (param $o (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:76:16 + ;;@ jsoptional/Main.java:82:16 (local $this (ref null $jsoptional.Main.NonJsTypeSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.NonJsTypeSubtype) (local.get $this.untyped))) (block @@ -1100,11 +1124,11 @@ (param $this.untyped (ref $java.lang.Object)) (param $arg0 (ref null $java.lang.Object)) (param $arg1 (ref null $java.lang.Object)) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (local $this (ref null $jsoptional.Main.NonJsTypeSubtype)) (local.set $this (ref.cast (ref $jsoptional.Main.NonJsTypeSubtype) (local.get $this.untyped))) (block - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (call_ref $function.m_m__java_lang_String__java_lang_Object__void (ref.as_non_null (local.get $this))(ref.cast (ref null $java.lang.String) (local.get $arg0))(local.get $arg1)(struct.get $jsoptional.Main.NonJsTypeSubtype.vtable $m_m__java_lang_String__java_lang_Object__void (struct.get $jsoptional.Main.NonJsTypeSubtype $vtable(local.get $this)))) ) ) @@ -1112,18 +1136,18 @@ ;;; void NonJsTypeSubtype.$clinit() (func $$clinit__void@jsoptional.Main.NonJsTypeSubtype - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (block - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (if (global.get $f_$initialized__jsoptional_Main_NonJsTypeSubtype) (then - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (return ) ) ) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (global.set $f_$initialized__jsoptional_Main_NonJsTypeSubtype (i32.const 1)) - ;;@ jsoptional/Main.java:74:15 + ;;@ jsoptional/Main.java:80:15 (call $$clinit__void@java.lang.Object ) ) )