update morphic

Cargo.lock

@@ -1927,6 +1927,7 @@ name = "morphic_lib"
 version = "0.1.0"
 dependencies = [
  "sha2",
+ "smallvec",
  "thiserror",
 ]
 

compiler/mono/src/alias_analysis.rs

@@ -146,7 +146,7 @@ fn proc_spec(proc: &Proc) -> Result<FuncDef> {
 #[derive(Default)]
 struct Env {
     symbols: MutMap<Symbol, ValueId>,
-    join_points: MutMap<crate::ir::JoinPointId, morphic_lib::JoinPointId>,
+    join_points: MutMap<crate::ir::JoinPointId, morphic_lib::ContinuationId>,
 }
 
 fn stmt_spec(
@@ -246,7 +246,7 @@ fn stmt_spec(
             let jp_arg_type_id = builder.add_tuple_type(&type_ids)?;
 
             let (jpid, jp_argument) =
-                builder.declare_join_point(block, jp_arg_type_id, ret_type_id)?;
+                builder.declare_continuation(block, jp_arg_type_id, ret_type_id)?;
 
             let join_body_sub_block = {
                 env.join_points.insert(*id, jpid);
@@ -270,7 +270,7 @@ fn stmt_spec(
             let cont_value_id = stmt_spec(builder, env, cont_block, layout, continuation)?;
 
             env.join_points.remove(id);
-            builder.define_join_point(jpid, join_body_sub_block)?;
+            builder.define_continuation(jpid, join_body_sub_block)?;
 
             builder.add_sub_block(block, BlockExpr(cont_block, cont_value_id))
         }

vendor/morphic_lib/Cargo.toml

@@ -7,3 +7,4 @@ edition = "2018"
 [dependencies]
 thiserror = "1.0.24"
 sha2 = "0.9.4"
+smallvec = "1.6.1"

vendor/morphic_lib/src/bindings.rs

@@ -218,27 +218,28 @@ pub unsafe extern "C" fn Morphic_FuncDefBuilder_Build(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn Morphic_FuncDefBuilder_DeclareJoinPoint(
+pub unsafe extern "C" fn Morphic_FuncDefBuilder_DeclareContinuation(
     self_: *mut FuncDefBuilder,
     block: BlockId,
     arg_type: TypeId,
     ret_type: TypeId,
-    out0: *mut JoinPointId,
+    out0: *mut ContinuationId,
     out1: *mut ValueId,
 ) -> *mut Error {
-    let (join_point, value) = check_err!((*self_).declare_join_point(block, arg_type, ret_type));
-    *out0 = join_point;
+    let (continuation, value) =
+        check_err!((*self_).declare_continuation(block, arg_type, ret_type));
+    *out0 = continuation;
     *out1 = value;
     ptr::null_mut()
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn Morphic_FuncDefBuilder_DefineJoinPoint(
+pub unsafe extern "C" fn Morphic_FuncDefBuilder_DefineContinuation(
     self_: *mut FuncDefBuilder,
-    join_point: JoinPointId,
+    continuation: ContinuationId,
     body: BlockExpr,
 ) -> *mut Error {
-    check_err!((*self_).define_join_point(join_point, body));
+    check_err!((*self_).define_continuation(continuation, body));
     ptr::null_mut()
 }
 
@@ -246,12 +247,12 @@ pub unsafe extern "C" fn Morphic_FuncDefBuilder_DefineJoinPoint(
 pub unsafe extern "C" fn Morphic_FuncDefBuilder_AddJump(
     self_: *mut FuncDefBuilder,
     block: BlockId,
-    join_point: JoinPointId,
+    continuation: ContinuationId,
     arg: ValueId,
     unreachable_result_type: TypeId,
     out: *mut ValueId,
 ) -> *mut Error {
-    *out = check_err!((*self_).add_jump(block, join_point, arg, unreachable_result_type));
+    *out = check_err!((*self_).add_jump(block, continuation, arg, unreachable_result_type));
     ptr::null_mut()
 }
 

vendor/morphic_lib/src/util/bytes_id.rs

@@ -4,13 +4,15 @@ macro_rules! bytes_id {
         $(#[$annot_borrowed:meta])* $borrowed_vis:vis $borrowed:ident;
         $(#[$annot_owned:meta])* $owned_vis:vis $owned:ident;
     ) => {
-        #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+        #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
         $(#[$annot_borrowed])*
         $borrowed_vis struct $borrowed<'a>($borrowed_vis &'a [u8]);
 
-        #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+        // The stack-allocated array portion of a `SmallVec` shares a union with two `usize`s, so on
+        // 64-bit platforms we can make the array up to 16 bytes long with no space penalty.
+        #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
         $(#[$annot_owned])*
-        $owned_vis struct $owned($owned_vis ::std::vec::Vec<u8>);
+        $owned_vis struct $owned($owned_vis ::smallvec::SmallVec<[u8; 16]>);
 
         impl $owned {
             fn borrowed<'a>(&'a self) -> $borrowed<'a> {
@@ -20,7 +22,7 @@ macro_rules! bytes_id {
 
         impl<'a> ::std::convert::From<$borrowed<'a>> for $owned {
             fn from(borrowed: $borrowed<'a>) -> Self {
-                $owned(<[u8]>::to_vec(&borrowed.0))
+                $owned(::smallvec::SmallVec::from_slice(&borrowed.0))
             }
         }
     }

vendor/morphic_lib/src/util/mod.rs

@@ -1,5 +1,14 @@
+#[macro_use]
+pub mod id_type;
+
 #[macro_use]
 pub mod bytes_id;
 
 #[macro_use]
 pub mod forward_trait;
+
+pub mod blocks;
+pub mod id_bi_map;
+pub mod id_vec;
+pub mod op_graph;
+pub mod replace_none;