merge

Author: gkdn

test/lit/passes/j2cl-inline.wast

@@ -6,11 +6,11 @@
 (module
 
   ;; A once function that has become empty
-  (func $clinit-trivial-1_<once>_  )
+  (func $clinit-trivial-1_<once>_@Foo  )
 
   ;; A once function that just calls another
-  (func $clinit-trivial-2_<once>_
-    (call $clinit-trivial-1_<once>_)
+  (func $clinit-trivial-2_<once>_@Bar
+    (call $clinit-trivial-1_<once>_@Foo)
   )
 
   ;; CHECK:      (type $0 (func))
@@ -19,7 +19,7 @@
   (global $$class-initialized@Zoo (mut i32) (i32.const 0))
 
   ;; Not hoisted but trivial.
-  ;; CHECK:      (func $clinit-non-trivial_<once>_ (type $0)
+  ;; CHECK:      (func $clinit-non-trivial_<once>_@Zoo (type $0)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (global.get $$class-initialized@Zoo)
   ;; CHECK-NEXT:   (return)
@@ -28,19 +28,19 @@
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit-non-trivial_<once>_
-    (if (global.get $f_$initialized__)
+  (func $clinit-non-trivial_<once>_@Zoo
+    (if (global.get $$class-initialized@Zoo)
      (return)
     )
     (global.set $$class-initialized@Zoo (i32.const 1))
   )
 
   ;; CHECK:      (func $main (type $0)
-  ;; CHECK-NEXT:  (call $clinit-non-trivial_<once>_)
+  ;; CHECK-NEXT:  (call $clinit-non-trivial_<once>_@Zoo)
   ;; CHECK-NEXT: )
   (func $main
-    (call $clinit-trivial-1_<once>_)
-    (call $clinit-trivial-2_<once>_)
-    (call $clinit-non-trivial_<once>_)
+    (call $clinit-trivial-1_<once>_@Foo)
+    (call $clinit-trivial-2_<once>_@Bar)
+    (call $clinit-non-trivial_<once>_@Zoo)
   )
 )

test/lit/passes/j2cl.wast

@@ -12,12 +12,12 @@
   (global $field-i32@Foo (mut i32) (i32.const 0))
   (global $field-f64@Foo (mut f64) (f64.const 0))
 
-  ;; CHECK:      (func $clinit_<once>_ (type $0)
+  ;; CHECK:      (func $clinit_<once>_@Foo (type $0)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
-  (func $clinit_<once>_
-    (global.set $field-i32 (i32.const 1))
-    (global.set $field-f64 (f64.const 1))
+  (func $clinit_<once>_@Foo
+    (global.set $field-i32@Foo (i32.const 1))
+    (global.set $field-f64@Foo (f64.const 1))
   )
 )
 
@@ -48,14 +48,14 @@
   ;; CHECK:      (global $field3@Foo anyref (global.get $field1@Foo))
   (global $field3@Foo (mut anyref) (ref.null none))
 
-  ;; CHECK:      (func $clinit_<once>_ (type $1)
-  ;; CHECK-NEXT:  (global.set $field2
+  ;; CHECK:      (func $clinit_<once>_@Foo (type $1)
+  ;; CHECK-NEXT:  (global.set $field2@Foo
   ;; CHECK-NEXT:   (struct.new $A
   ;; CHECK-NEXT:    (global.get $referredFieldMut@Foo)
   ;; CHECK-NEXT:   )
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_<once>_
+  (func $clinit_<once>_@Foo
     ;; Referred field is immutable, should hoist
     (global.set $field1@Foo (struct.new $A (
       global.get $referredField@Foo)
@@ -85,17 +85,17 @@
 
   (global $field-any@Foo (mut anyref) (struct.new $A))
 
-  ;; CHECK:      (func $clinit_<once>_ (type $1)
-  ;; CHECK-NEXT:  (global.set $field-i32
+  ;; CHECK:      (func $clinit_<once>_@Foo (type $1)
+  ;; CHECK-NEXT:  (global.set $field-i32@Foo
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT:  (global.set $field-any@Foo
   ;; CHECK-NEXT:   (struct.new_default $A)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_<once>_
-    (global.set $field-i32 (i32.const 1))
-    (global.set $field-any (struct.new $A))
+  (func $clinit_<once>_@Foo
+    (global.set $field-i32@Foo (i32.const 1))
+    (global.set $field-any@Foo (struct.new $A))
   )
 )
 
@@ -107,11 +107,11 @@
   ;; CHECK:      (global $field@Foo i32 (i32.const 1))
   (global $field@Foo (mut i32) (i32.const 0))
 
-  ;; CHECK:      (func $clinit_<once>_ (type $0)
+  ;; CHECK:      (func $clinit_<once>_@Foo (type $0)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
-  (func $clinit_<once>_
-    (global.set $field-i32 (i32.const 1))
+  (func $clinit_<once>_@Foo
+    (global.set $field@Foo (i32.const 1))
   )
 )
 
@@ -123,12 +123,31 @@
   ;; CHECK:      (global $$class-initialized@Foo (mut i32) (i32.const 0))
   (global $$class-initialized@Foo (mut i32) (i32.const 0))
 
-  ;; CHECK:      (func $clinit_<once>_ (type $0)
-  ;; CHECK-NEXT:  (global.set $f_$initialized__
+  ;; CHECK:      (func $clinit_<once>_@Foo (type $0)
+  ;; CHECK-NEXT:  (global.set $$class-initialized@Foo
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_<once>_
-    (global.set $f_$initialized__ (i32.const 1))
+  (func $clinit_<once>_@Foo
+    (global.set $$class-initialized@Foo (i32.const 1))
+  )
+)
+
+;; Fields from different classes are not hoisted.
+(module
+
+  ;; CHECK:      (type $0 (func))
+
+  ;; CHECK:      (global $field@Foo (mut i32) (i32.const 0))
+  (global $field@Foo (mut i32) (i32.const 0))
+
+  ;; CHECK:      (func $clinit_<once>_@Bar (type $0)
+  ;; CHECK-NEXT:  (global.set $field@Foo
+  ;; CHECK-NEXT:   (i32.const 1)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $clinit_<once>_@Bar
+    ;; Note that $clinit is @Bar and field is @Foo.
+    (global.set $field@Foo (i32.const 1))
   )
 )