Release vere-v2.11 to live (#488)

urbit · Jul 5, 2023 · ef758f4 · ef758f4
2 parents 463dec7 + b217982
commit ef758f4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
@@ -241,6 +241,7 @@ jobs:
           # We don't use -n here because we want to overwrite the version
           # string.
           gsutil cp ./bazel-bin/version "$target"
+          exitcode=$?
 
           [ $exitcode -eq 0 ] &&
             echo "Upload to $target completed successfully." ||

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.10
+2.11
diff --git a/pkg/noun/events.c b/pkg/noun/events.c
@@ -1715,7 +1715,7 @@ u3e_ward(u3_post low_p, u3_post hig_p)
   c3_w sop_w = hig_p >> u3a_page;
   c3_w pag_w = u3P.gar_w;
 
-  if ( !((pag_w > nop_w) && (pag_w < hig_p)) ) {
+  if ( !((pag_w > nop_w) && (pag_w < sop_w)) ) {
     u3_assert( !_ce_ward_post(nop_w, sop_w) );
     u3_assert( !_ce_flaw_mprotect(pag_w) );
     u3_assert( u3P.dit_w[pag_w >> 5] & (1 << (pag_w & 31)) );

diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c
@@ -518,7 +518,7 @@ _pave_road(c3_w* rut_w, c3_w* mat_w, c3_w* cap_w, c3_w siz_w)
    len_w - size of your loom in words
 */
 static u3_road*
-_pave_north(c3_w* mem_w, c3_w siz_w, c3_w len_w)
+_pave_north(c3_w* mem_w, c3_w siz_w, c3_w len_w, c3_o kid_o)
 {
   //  in a north road, the heap is low and the stack is high
   //
@@ -533,6 +533,10 @@ _pave_north(c3_w* mem_w, c3_w siz_w, c3_w len_w)
   c3_w* rut_w = c3_align(mem_w, u3C.balign_d, C3_ALGHI);
   c3_w* cap_w = mat_w;
 
+  if ( c3y == kid_o ) {
+    u3e_ward(u3of(c3_w, rut_w) - 1, u3of(c3_w, cap_w));
+  }
+
   return _pave_road(rut_w, mat_w, cap_w, siz_w);
 }
 
@@ -555,10 +559,13 @@ _pave_south(c3_w* mem_w, c3_w siz_w, c3_w len_w)
   //
   //    00~~~|M|+++|C|######|H|---|R|~~~FFF
   //         ^---u3R which _pave_road returns
+  //
   c3_w* mat_w = c3_align(mem_w, u3C.balign_d, C3_ALGHI);
   c3_w* rut_w = c3_align(mem_w + len_w, u3C.balign_d, C3_ALGLO);
   c3_w* cap_w = mat_w + siz_w;
 
+  u3e_ward(u3of(c3_w, cap_w) - 1, u3of(c3_w, rut_w));
+
   return _pave_road(rut_w, mat_w, cap_w, siz_w);
 }
 
@@ -574,7 +581,7 @@ _pave_home(void)
   c3_w  siz_w = c3_wiseof(u3v_home);
   c3_w  len_w = u3C.wor_i - u3C.walign_w;
 
-  u3H = (void *)_pave_north(mem_w, siz_w, len_w);
+  u3H = (void *)_pave_north(mem_w, siz_w, len_w, c3n);
   u3H->ver_w = U3V_VERLAT;
   u3R = &u3H->rod_u;
 
@@ -879,7 +886,7 @@ u3m_leap(c3_w pad_w)
     else {
       bot_p = u3R->cap_p;
 
-      rod_u = _pave_north(u3a_into(bot_p), c3_wiseof(u3a_road), len_w);
+      rod_u = _pave_north(u3a_into(bot_p), c3_wiseof(u3a_road), len_w, c3y);
 #if 0
       fprintf(stderr, "SPAR.hat_p: 0x%x %p, NKID.hat_p: 0x%x %p\r\n",
               u3R->hat_p, u3a_into(u3R->hat_p),
@@ -901,7 +908,6 @@ u3m_leap(c3_w pad_w)
   */
   {
     u3R = rod_u;
-    u3m_ward();
     _pave_parts();
   }
 #ifdef U3_MEMORY_DEBUG

diff --git a/pkg/vere/main.c b/pkg/vere/main.c
@@ -1925,13 +1925,10 @@ _cw_meld(c3_i argc, c3_c* argv[])
   }
 
   u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); // XX s/b try_aquire lock
-  c3_w     pre_w;
 
   u3C.wag_w |= u3o_hashless;
   u3m_boot(u3_Host.dir_c, (size_t)1 << u3_Host.ops_u.lom_y);
 
-  pre_w = u3a_open(u3R);
-  u3u_meld();
   u3a_print_memory(stderr, "urbit: meld: gained", u3u_meld());
 
   u3m_save();