Merge branch 'andriy/rc--2023-06-07_23-01' into 'rc--2023-06-07_23-01'

[hotfix] RUN-668 Fix `QueryCache::push()` crash See merge request dfinity-lab/public/ic!12903
dfinity · Jun 13, 2023 · e0c5ad6 · e0c5ad6
2 parents 7418a4c + 12c5035
commit e0c5ad6
Show file tree

Hide file tree

Showing 22 changed files with 272 additions and 1,178 deletions.
diff --git a/rs/config/src/embedders.rs b/rs/config/src/embedders.rs
@@ -75,7 +75,7 @@ impl FeatureFlags {
         Self {
             rate_limiting_of_debug_prints: FlagStatus::Enabled,
             write_barrier: FlagStatus::Disabled,
-            wasm_native_stable_memory: FlagStatus::Enabled,
+            wasm_native_stable_memory: FlagStatus::Disabled,
         }
     }
 }

diff --git a/rs/embedders/tests/snapshots/instrumentation__app.snap b/rs/embedders/tests/snapshots/instrumentation__app.snap
@@ -6,17 +6,10 @@ expression: out
   (type (;0;) (func (param i32) (result i32)))
   (type (;1;) (func))
   (type (;2;) (func (param i32 i32 i32) (result i32)))
-  (type (;3;) (func (param i64 i64 i32) (result i64)))
-  (type (;4;) (func (param i32)))
-  (type (;5;) (func (param i64 i64 i64)))
-  (type (;6;) (func (param i64) (result i64)))
-  (type (;7;) (func (param i32 i32) (result i32 i32)))
+  (type (;3;) (func (param i64) (result i64)))
   (import "__" "out_of_instructions" (func $compute (;0;) (type 1)))
   (import "__" "update_available_memory" (func $double (;1;) (type 2)))
-  (import "__" "try_grow_stable_memory" (func (;2;) (type 3)))
-  (import "__" "internal_trap" (func (;3;) (type 4)))
-  (import "__" "stable_read_first_access" (func (;4;) (type 5)))
-  (func (;5;) (type 0) (param i32) (result i32)
+  (func (;2;) (type 0) (param i32) (result i32)
     (local i32 i32)
     global.get 0
     i64.const 18
@@ -104,7 +97,7 @@ expression: out
     i32.const 100
     i32.div_s
   )
-  (func (;6;) (type 0) (param i32) (result i32)
+  (func (;3;) (type 0) (param i32) (result i32)
     global.get 0
     i64.const 3
     i64.sub
@@ -119,7 +112,7 @@ expression: out
     local.get 0
     i32.mul
   )
-  (func (;7;) (type 6) (param i64) (result i64)
+  (func (;4;) (type 3) (param i64) (result i64)
     (local i64)
     global.get 0
     local.get 0
@@ -141,66 +134,10 @@ expression: out
     end
     local.get 0
   )
-  (func (;8;) (type 7) (param i32 i32) (result i32 i32)
-    (local i32 i32 i32 i32)
-    local.get 0
-    local.get 1
-    i32.ge_u
-    if ;; label = @1
-      i32.const 0
-      i32.const 0
-      return
-    end
-    local.get 0
-    local.set 2
-    loop ;; label = @1
-      local.get 2
-      i32.load8_u 2
-      local.tee 3
-      i32.const 1
-      i32.and
-      local.get 4
-      i32.add
-      local.set 4
-      local.get 3
-      i32.const 1
-      i32.shr_u
-      i32.const 1
-      i32.and
-      local.get 5
-      i32.add
-      local.set 5
-      local.get 2
-      i32.const 1
-      i32.add
-      local.tee 2
-      local.get 1
-      i32.lt_u
-      br_if 0 (;@1;)
-    end
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 4
-    i32.sub
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 5
-    i32.sub
-  )
   (memory (;0;) 17)
-  (memory (;1;) i64 0 1048576)
-  (memory (;2;) 256 256)
   (global (;0;) (mut i64) i64.const 0)
-  (global (;1;) (mut i64) i64.const 0)
-  (global (;2;) (mut i64) i64.const 0)
   (export "memory" (memory 0))
-  (export "compute" (func 5))
-  (export "double" (func 6))
-  (export "stable_memory" (memory 1))
-  (export "stable_bytemap_memory" (memory 2))
+  (export "compute" (func 2))
+  (export "double" (func 3))
   (export "canister counter_instructions" (global 0))
-  (export "canister counter_dirty_pages" (global 1))
-  (export "canister counter_accessed_pages" (global 2))
 )
diff --git a/rs/embedders/tests/snapshots/instrumentation__app2.snap b/rs/embedders/tests/snapshots/instrumentation__app2.snap
@@ -6,16 +6,9 @@ expression: out
   (type (;0;) (func (param i64) (result i64)))
   (type (;1;) (func))
   (type (;2;) (func (param i32 i32 i32) (result i32)))
-  (type (;3;) (func (param i64 i64 i32) (result i64)))
-  (type (;4;) (func (param i32)))
-  (type (;5;) (func (param i64 i64 i64)))
-  (type (;6;) (func (param i32 i32) (result i32 i32)))
   (import "__" "out_of_instructions" (func $compute (;0;) (type 1)))
   (import "__" "update_available_memory" (func $tenfold (;1;) (type 2)))
-  (import "__" "try_grow_stable_memory" (func $inc (;2;) (type 3)))
-  (import "__" "internal_trap" (func (;3;) (type 4)))
-  (import "__" "stable_read_first_access" (func (;4;) (type 5)))
-  (func (;5;) (type 0) (param i64) (result i64)
+  (func $inc (;2;) (type 0) (param i64) (result i64)
     (local i64)
     global.get 0
     i64.const 6
@@ -30,7 +23,7 @@ expression: out
     local.get 0
     i64.const 3
     i64.mul
-    call 7
+    call 4
     local.set 1
     block ;; label = @1
       global.get 0
@@ -96,12 +89,12 @@ expression: out
         end
       end
       local.get 1
-      call 6
+      call 3
       local.set 1
     end
     local.get 1
   )
-  (func (;6;) (type 0) (param i64) (result i64)
+  (func (;3;) (type 0) (param i64) (result i64)
     global.get 0
     i64.const 3
     i64.sub
@@ -116,7 +109,7 @@ expression: out
     local.get 0
     i64.mul
   )
-  (func (;7;) (type 0) (param i64) (result i64)
+  (func (;4;) (type 0) (param i64) (result i64)
     global.get 0
     i64.const 3
     i64.sub
@@ -131,7 +124,7 @@ expression: out
     i64.const 1
     i64.add
   )
-  (func (;8;) (type 0) (param i64) (result i64)
+  (func (;5;) (type 0) (param i64) (result i64)
     (local i64)
     global.get 0
     local.get 0
@@ -153,65 +146,9 @@ expression: out
     end
     local.get 0
   )
-  (func (;9;) (type 6) (param i32 i32) (result i32 i32)
-    (local i32 i32 i32 i32)
-    local.get 0
-    local.get 1
-    i32.ge_u
-    if ;; label = @1
-      i32.const 0
-      i32.const 0
-      return
-    end
-    local.get 0
-    local.set 2
-    loop ;; label = @1
-      local.get 2
-      i32.load8_u 1
-      local.tee 3
-      i32.const 1
-      i32.and
-      local.get 4
-      i32.add
-      local.set 4
-      local.get 3
-      i32.const 1
-      i32.shr_u
-      i32.const 1
-      i32.and
-      local.get 5
-      i32.add
-      local.set 5
-      local.get 2
-      i32.const 1
-      i32.add
-      local.tee 2
-      local.get 1
-      i32.lt_u
-      br_if 0 (;@1;)
-    end
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 4
-    i32.sub
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 5
-    i32.sub
-  )
-  (memory (;0;) i64 0 1048576)
-  (memory (;1;) 256 256)
   (global (;0;) (mut i64) i64.const 0)
-  (global (;1;) (mut i64) i64.const 0)
-  (global (;2;) (mut i64) i64.const 0)
-  (export "compute" (func 5))
-  (export "tenfold" (func 6))
-  (export "inc" (func 7))
-  (export "stable_memory" (memory 0))
-  (export "stable_bytemap_memory" (memory 1))
+  (export "compute" (func $inc))
+  (export "tenfold" (func 3))
+  (export "inc" (func 4))
   (export "canister counter_instructions" (global 0))
-  (export "canister counter_dirty_pages" (global 1))
-  (export "canister counter_accessed_pages" (global 2))
 )
diff --git a/rs/embedders/tests/snapshots/instrumentation__basic.snap b/rs/embedders/tests/snapshots/instrumentation__basic.snap
@@ -6,17 +6,10 @@ expression: out
   (type (;0;) (func (param i32 i32) (result i32)))
   (type (;1;) (func))
   (type (;2;) (func (param i32 i32 i32) (result i32)))
-  (type (;3;) (func (param i64 i64 i32) (result i64)))
-  (type (;4;) (func (param i32)))
-  (type (;5;) (func (param i64 i64 i64)))
-  (type (;6;) (func (param i64) (result i64)))
-  (type (;7;) (func (param i32 i32) (result i32 i32)))
+  (type (;3;) (func (param i64) (result i64)))
   (import "__" "out_of_instructions" (func $addTwo (;0;) (type 1)))
   (import "__" "update_available_memory" (func (;1;) (type 2)))
-  (import "__" "try_grow_stable_memory" (func (;2;) (type 3)))
-  (import "__" "internal_trap" (func (;3;) (type 4)))
-  (import "__" "stable_read_first_access" (func (;4;) (type 5)))
-  (func (;5;) (type 0) (param i32 i32) (result i32)
+  (func (;2;) (type 0) (param i32 i32) (result i32)
     global.get 0
     i64.const 3
     i64.sub
@@ -31,7 +24,7 @@ expression: out
     local.get 1
     i32.add
   )
-  (func (;6;) (type 6) (param i64) (result i64)
+  (func (;3;) (type 3) (param i64) (result i64)
     (local i64)
     global.get 0
     local.get 0
@@ -53,63 +46,7 @@ expression: out
     end
     local.get 0
   )
-  (func (;7;) (type 7) (param i32 i32) (result i32 i32)
-    (local i32 i32 i32 i32)
-    local.get 0
-    local.get 1
-    i32.ge_u
-    if ;; label = @1
-      i32.const 0
-      i32.const 0
-      return
-    end
-    local.get 0
-    local.set 2
-    loop ;; label = @1
-      local.get 2
-      i32.load8_u 1
-      local.tee 3
-      i32.const 1
-      i32.and
-      local.get 4
-      i32.add
-      local.set 4
-      local.get 3
-      i32.const 1
-      i32.shr_u
-      i32.const 1
-      i32.and
-      local.get 5
-      i32.add
-      local.set 5
-      local.get 2
-      i32.const 1
-      i32.add
-      local.tee 2
-      local.get 1
-      i32.lt_u
-      br_if 0 (;@1;)
-    end
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 4
-    i32.sub
-    local.get 1
-    local.get 0
-    i32.sub
-    local.get 5
-    i32.sub
-  )
-  (memory (;0;) i64 0 1048576)
-  (memory (;1;) 256 256)
   (global (;0;) (mut i64) i64.const 0)
-  (global (;1;) (mut i64) i64.const 0)
-  (global (;2;) (mut i64) i64.const 0)
-  (export "addTwo" (func 5))
-  (export "stable_memory" (memory 0))
-  (export "stable_bytemap_memory" (memory 1))
+  (export "addTwo" (func 2))
   (export "canister counter_instructions" (global 0))
-  (export "canister counter_dirty_pages" (global 1))
-  (export "canister counter_accessed_pages" (global 2))
 )