once

Author: gkdn

src/passes/J2CLOpts.cpp

@@ -30,7 +30,7 @@ namespace wasm {
 
 namespace {
 
-bool isOnceFunction(Function* f) { return f->name.hasSubstring("_@once@_"); }
+bool isOnceFunction(Function* f) { return f->name.hasSubstring("_<once>_"); }
 
 using AssignmentCountMap = std::unordered_map<Name, Index>;
 

test/lit/passes/j2cl-inline.wast

@@ -1,16 +1,16 @@
 ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
 
-;; RUN: foreach %s %t wasm-opt --no-inline=*_@once@_* --optimize-j2cl --inlining --vacuum --optimize-level=3 -all -S -o - | filecheck %s
+;; RUN: foreach %s %t wasm-opt --no-inline=*_<once>_* --optimize-j2cl --inlining --vacuum --optimize-level=3 -all -S -o - | filecheck %s
 
 ;; Only trivial once functions are inlined
 (module
 
   ;; A once function that has become empty
-  (func $clinit-trivial-1_@once@_  )
+  (func $clinit-trivial-1_<once>_  )
 
   ;; A once function that just calls another
-  (func $clinit-trivial-2_@once@_
-    (call $clinit-trivial-1_@once@_)
+  (func $clinit-trivial-2_<once>_
+    (call $clinit-trivial-1_<once>_)
   )
 
   ;; CHECK:      (type $0 (func))
@@ -19,7 +19,7 @@
   (global $f_$initialized__ (mut i32) (i32.const 0))
 
   ;; Not hoisted but trivial.
-  ;; CHECK:      (func $clinit-non-trivial_@once@_ (type $0)
+  ;; CHECK:      (func $clinit-non-trivial_<once>_ (type $0)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (global.get $f_$initialized__)
   ;; CHECK-NEXT:   (return)
@@ -28,19 +28,19 @@
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit-non-trivial_@once@_
+  (func $clinit-non-trivial_<once>_
     (if (global.get $f_$initialized__)
      (return)
     )
     (global.set $f_$initialized__ (i32.const 1))
   )
 
   ;; CHECK:      (func $main (type $0)
-  ;; CHECK-NEXT:  (call $clinit-non-trivial_@once@_)
+  ;; CHECK-NEXT:  (call $clinit-non-trivial_<once>_)
   ;; CHECK-NEXT: )
   (func $main
-    (call $clinit-trivial-1_@once@_)
-    (call $clinit-trivial-2_@once@_)
-    (call $clinit-non-trivial_@once@_)
+    (call $clinit-trivial-1_<once>_)
+    (call $clinit-trivial-2_<once>_)
+    (call $clinit-non-trivial_<once>_)
   )
 )

test/lit/passes/j2cl.wast

@@ -12,10 +12,10 @@
   (global $field-i32 (mut i32) (i32.const 0))
   (global $field-f64 (mut f64) (f64.const 0))
 
-  ;; CHECK:      (func $clinit_@once@_ (type $0)
+  ;; CHECK:      (func $clinit_<once>_ (type $0)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
-  (func $clinit_@once@_
+  (func $clinit_<once>_
     (global.set $field-i32 (i32.const 1))
     (global.set $field-f64 (f64.const 1))
   )
@@ -48,14 +48,14 @@
   ;; CHECK:      (global $field3 anyref (global.get $field1))
   (global $field3 (mut anyref) (ref.null none))
 
-  ;; CHECK:      (func $clinit_@once@_ (type $1)
+  ;; CHECK:      (func $clinit_<once>_ (type $1)
   ;; CHECK-NEXT:  (global.set $field2
   ;; CHECK-NEXT:   (struct.new $A
   ;; CHECK-NEXT:    (global.get $referredFieldMut)
   ;; CHECK-NEXT:   )
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_@once@_
+  (func $clinit_<once>_
     ;; Referred field is immutable, should hoist
     (global.set $field1 (struct.new $A (
       global.get $referredField)
@@ -85,15 +85,15 @@
 
   (global $field-any (mut anyref) (struct.new $A))
 
-  ;; CHECK:      (func $clinit_@once@_ (type $1)
+  ;; CHECK:      (func $clinit_<once>_ (type $1)
   ;; CHECK-NEXT:  (global.set $field-i32
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT:  (global.set $field-any
   ;; CHECK-NEXT:   (struct.new_default $A)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_@once@_
+  (func $clinit_<once>_
     (global.set $field-i32 (i32.const 1))
     (global.set $field-any (struct.new $A))
   )
@@ -107,10 +107,10 @@
   ;; CHECK:      (global $field-i32 i32 (i32.const 1))
   (global $field-i32 (mut i32) (i32.const 0))
 
-  ;; CHECK:      (func $clinit_@once@_ (type $0)
+  ;; CHECK:      (func $clinit_<once>_ (type $0)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
-  (func $clinit_@once@_
+  (func $clinit_<once>_
     (global.set $field-i32 (i32.const 1))
   )
 )
@@ -123,12 +123,12 @@
   ;; CHECK:      (global $f_$initialized__ (mut i32) (i32.const 0))
   (global $f_$initialized__ (mut i32) (i32.const 0))
 
-  ;; CHECK:      (func $clinit_@once@_ (type $0)
+  ;; CHECK:      (func $clinit_<once>_ (type $0)
   ;; CHECK-NEXT:  (global.set $f_$initialized__
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $clinit_@once@_
+  (func $clinit_<once>_
     (global.set $f_$initialized__ (i32.const 1))
   )
 )