Add 'bool' and 'char' to the allow-list of same-instance future/stream copies

Author: lukewagner

design/mvp/CanonicalABI.md

@@ -1448,7 +1448,7 @@ remains blocked:
       self.set_pending(inst, dst_buffer, on_copy, on_copy_done)
     else:
       assert(self.t == dst_buffer.t == self.pending_buffer.t)
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       if self.pending_buffer.remain() > 0:
         if dst_buffer.remain() > 0:
           n = min(dst_buffer.remain(), self.pending_buffer.remain())
@@ -1460,7 +1460,7 @@ remains blocked:
         self.set_pending(inst, dst_buffer, on_copy, on_copy_done)
 ```
 Currently, there is a trap when both the `read` and `write` come from the same
-component instance and there is a non-empty, non-number element type. This trap
+component instance and there is a non-empty, non-primitive element type. This trap
 will be removed in a subsequent release; the reason for the trap is that when
 lifting and lowering can alias the same memory, interleavings can be complex
 and must be handled carefully. Future improvements to the Canonical ABI ([lazy
@@ -1482,7 +1482,7 @@ pending:
       self.set_pending(inst, src_buffer, on_copy, on_copy_done)
     else:
       assert(self.t == src_buffer.t == self.pending_buffer.t)
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       if self.pending_buffer.remain() > 0:
         if src_buffer.remain() > 0:
           n = min(src_buffer.remain(), self.pending_buffer.remain())
@@ -1505,13 +1505,14 @@ notifying the reader end and allowing it to rendezvous with a non-zero-length
 `read` and make progress. See the [stream readiness] section in the async
 explainer for more background on purpose of zero-length reads and writes.
 
-The `none_or_number_type` predicate used above includes both the integer and
+The `none_or_primitive_type` predicate used above includes both the integer and
 floating point number types:
 ```python
-def none_or_number_type(t):
+def none_or_primitive_type(t):
   return t is None or isinstance(t, U8Type | U16Type | U32Type | U64Type |
                                     S8Type | S16Type | S32Type | S64Type |
-                                    F32Type | F64Type)
+                                    F32Type | F64Type |
+                                    BoolType | CharType)
 ```
 
 The two ends of a stream are stored as separate elements in the component
@@ -1657,7 +1658,7 @@ end was dropped before receiving a value.
     if not self.pending_buffer:
       self.set_pending(inst, dst_buffer, on_copy_done)
     else:
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       dst_buffer.write(self.pending_buffer.read(1))
       self.reset_and_notify_pending(CopyResult.COMPLETED)
       on_copy_done(CopyResult.COMPLETED)
@@ -1669,7 +1670,7 @@ end was dropped before receiving a value.
     elif not self.pending_buffer:
       self.set_pending(inst, src_buffer, on_copy_done)
     else:
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       self.pending_buffer.write(src_buffer.read(1))
       self.reset_and_notify_pending(CopyResult.COMPLETED)
       on_copy_done(CopyResult.COMPLETED)

design/mvp/canonical-abi/definitions.py

@@ -847,7 +847,7 @@ def read(self, inst, dst_buffer, on_copy, on_copy_done):
       self.set_pending(inst, dst_buffer, on_copy, on_copy_done)
     else:
       assert(self.t == dst_buffer.t == self.pending_buffer.t)
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       if self.pending_buffer.remain() > 0:
         if dst_buffer.remain() > 0:
           n = min(dst_buffer.remain(), self.pending_buffer.remain())
@@ -865,7 +865,7 @@ def write(self, inst, src_buffer, on_copy, on_copy_done):
       self.set_pending(inst, src_buffer, on_copy, on_copy_done)
     else:
       assert(self.t == src_buffer.t == self.pending_buffer.t)
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       if self.pending_buffer.remain() > 0:
         if src_buffer.remain() > 0:
           n = min(src_buffer.remain(), self.pending_buffer.remain())
@@ -878,10 +878,11 @@ def write(self, inst, src_buffer, on_copy, on_copy_done):
         self.reset_and_notify_pending(CopyResult.COMPLETED)
         self.set_pending(inst, src_buffer, on_copy, on_copy_done)
 
-def none_or_number_type(t):
+def none_or_primitive_type(t):
   return t is None or isinstance(t, U8Type | U16Type | U32Type | U64Type |
                                     S8Type | S16Type | S32Type | S64Type |
-                                    F32Type | F64Type)
+                                    F32Type | F64Type |
+                                    BoolType | CharType)
 
 class CopyState(Enum):
   IDLE = 1
@@ -984,7 +985,7 @@ def read(self, inst, dst_buffer, on_copy_done):
     if not self.pending_buffer:
       self.set_pending(inst, dst_buffer, on_copy_done)
     else:
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       dst_buffer.write(self.pending_buffer.read(1))
       self.reset_and_notify_pending(CopyResult.COMPLETED)
       on_copy_done(CopyResult.COMPLETED)
@@ -996,7 +997,7 @@ def write(self, inst, src_buffer, on_copy_done):
     elif not self.pending_buffer:
       self.set_pending(inst, src_buffer, on_copy_done)
     else:
-      trap_if(inst is self.pending_inst and not none_or_number_type(self.t)) # temporary
+      trap_if(inst is self.pending_inst and not none_or_primitive_type(self.t)) # temporary
       self.pending_buffer.write(src_buffer.read(1))
       self.reset_and_notify_pending(CopyResult.COMPLETED)
       on_copy_done(CopyResult.COMPLETED)

design/mvp/canonical-abi/run_tests.py

@@ -2779,6 +2779,8 @@ def core_consumer(thread, args):
 test_self_copy(None)
 test_self_copy(U8Type())
 test_self_copy(F64Type())
+test_self_copy(BoolType())
+test_self_copy(CharType())
 test_async_flat_params()
 test_threads()
 test_thread_cancel_callback()