Fix copying of globals (#1854)

This broke when we refactored imports, as now Global has two more fields.

Test is on --func-metrics, which depends on copying to compute some things.

2 files changed, 29 insertions, 0 deletions

diff --git a/test/passes/func-metrics.txt b/test/passes/func-metrics.txt
index 2d3b8a12b..2d70c07c9 100644
--- a/test/passes/func-metrics.txt
+++ b/test/passes/func-metrics.txt
@@ -199,3 +199,23 @@ start: func_a
   (call $waka)
  )
 )
+global
+ [funcs]        : 1       
+ [imports]      : 1       
+ [total]        : 1       
+ global.get     : 1       
+func: 0
+ [binary-bytes] : 4       
+ [total]        : 1       
+ global.get     : 1       
+export: stackSave (0)
+ [removable-bytes-without-it]: 74      
+(module
+ (type $0 (func (result i32)))
+ (import "env" "STACKTOP" (global $gimport$0 i32))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (export "stackSave" (func $0))
+ (func $0 (; 0 ;) (type $0) (result i32)
+  (global.get $global$0)
+ )
+)
diff --git a/test/passes/func-metrics.wast b/test/passes/func-metrics.wast
index 5b16848ea..e95d819d9 100644
--- a/test/passes/func-metrics.wast
+++ b/test/passes/func-metrics.wast
@@ -122,4 +122,13 @@
   (call $waka)
  )
 )
+(module ;; various globals
+ (type $0 (func (result i32)))
+ (import "env" "STACKTOP" (global $gimport$0 i32))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (export "stackSave" (func $0))
+ (func $0 (; 0 ;) (type $0) (result i32)
+  (global.get $global$0)
+ )
+)