Fixed fn pointer type bug

Author: FractalFir

bin/c_success_corebenches.txt

@@ -148,6 +148,7 @@ fmt::write_str_macro_debug
 fmt::write_str_macro_debug_ascii
 fmt::write_str_ref
 fmt::write_str_value
+fmt::write_u128_max
 fmt::write_u128_min
 fmt::write_u64_max
 fmt::write_u64_min
@@ -318,8 +319,6 @@ num::dec2flt::bench_short_decimal
 num::int_log::u128_log10_predictable
 num::int_log::u128_log10_random
 num::int_log::u128_log10_random_small
-num::int_log::u128_log_random
-num::int_log::u128_log_random_small
 num::int_log::u16_log10_predictable
 num::int_log::u16_log10_random
 num::int_log::u16_log10_random_small
@@ -345,11 +344,9 @@ num::int_log::u8_log_geometric
 num::int_log::u8_log_random
 num::int_log::u8_log_random_small
 num::int_pow::overflowing_pow_variable
-num::int_pow::pow_m7
-num::int_pow::pow_m8
-num::int_pow::pow_variable
 num::int_pow::saturating_pow_variable
 num::int_pow::wrapping_pow_variable
+num::int_sqrt::u128_sqrt_predictable
 num::int_sqrt::u128_sqrt_random
 num::int_sqrt::u128_sqrt_random_small
 num::int_sqrt::u128_sqrt_uniform

bin/c_success_coretests.txt

@@ -13,7 +13,6 @@ any::distinct_type_names
 any::dyn_type_name
 array::array_from_fn
 array::array_from_mut
-array::array_from_ref
 array::array_into_iter_fold
 array::array_into_iter_rfold
 array::array_intoiter_advance_back_by
@@ -75,6 +74,7 @@ atomic::atomic_alignment
 atomic::atomic_compare_exchange
 atomic::bool_
 atomic::bool_nand
+atomic::int_and
 atomic::int_max
 atomic::int_min
 atomic::int_nand
@@ -136,11 +136,13 @@ char::test_decode_utf16
 char::test_decode_utf16_size_hint
 char::test_encode_utf16
 char::test_encode_utf8
+char::test_escape_debug
 char::test_escape_default
 char::test_escape_unicode
 char::test_from_str
 char::test_is_control
 char::test_is_lowercase
+char::test_is_numeric
 char::test_is_uppercase
 char::test_is_whitespace
 char::test_len_utf16
@@ -236,11 +238,13 @@ hash::sip::test_write_short_works
 hash::test_build_hasher_dyn_compatible
 hash::test_custom_state
 hash::test_indirect_hasher
+hint::select_unpredictable_drop
 intrinsics::carrying_mul_add_fallback_i128
 intrinsics::carrying_mul_add_fallback_i32
 intrinsics::carrying_mul_add_fallback_u128
 intrinsics::carrying_mul_add_fallback_u32
 intrinsics::test_assume_can_be_in_const_contexts
+intrinsics::test_const_allocate_at_runtime
 intrinsics::test_const_deallocate_at_runtime
 intrinsics::test_hints_in_const_contexts
 intrinsics::test_three_way_compare_in_const_contexts
@@ -344,7 +348,6 @@ iter::adapters::map_windows::output_n2
 iter::adapters::map_windows::test_case_from_pr_82413_comment
 iter::adapters::map_windows::test_laziness
 iter::adapters::map_windows::test_size_hint
-iter::adapters::map_windows::test_too_large_array_size
 iter::adapters::map_windows::test_zero_sized_type
 iter::adapters::peekable::test_iterator_peekable
 iter::adapters::peekable::test_iterator_peekable_count
@@ -412,7 +415,6 @@ iter::adapters::zip::test_zip_nth_back_side_effects_exhausted
 iter::adapters::zip::test_zip_nth_side_effects
 iter::adapters::zip::test_zip_trusted_random_access_composition
 iter::extend_for_unit
-iter::range::test_ascii_char_range
 iter::range::test_char_range
 iter::range::test_double_ended_range
 iter::range::test_range
@@ -562,8 +564,6 @@ mem::uninit_array_assume_init
 mem::uninit_const_assume_init_read
 mem::uninit_write_clone_of_slice
 mem::uninit_write_clone_of_slice_no_drop
-mem::uninit_write_clone_of_slice_panic_gt
-mem::uninit_write_clone_of_slice_panic_lt
 mem::uninit_write_copy_of_slice
 mem::uninit_write_copy_of_slice_panic_gt
 mem::uninit_write_copy_of_slice_panic_lt
@@ -1360,12 +1360,8 @@ panic::location::location_const_caller
 panic::location::location_const_column
 panic::location::location_const_file
 panic::location::location_const_line
-pattern::double_ended_regression_test
-pattern::test_forward_search_shared_bytes
-pattern::test_reverse_search_shared_bytes
 pattern::test_simple_iteration
 pattern::test_simple_search
-pattern::test_stress_indices
 pin::pin_const
 pin_macro::basic
 pin_macro::extension_works_through_block
@@ -1466,8 +1462,6 @@ slice::slice_index::boundpair_neg_width::pass
 slice::slice_index::boundpair_overflow_end::index_fail
 slice::slice_index::boundpair_overflow_end::index_mut_fail
 slice::slice_index::boundpair_overflow_end::pass
-slice::slice_index::boundpair_overflow_start::index_fail
-slice::slice_index::boundpair_overflow_start::index_mut_fail
 slice::slice_index::boundpair_overflow_start::pass
 slice::slice_index::range_len_len::index_fail
 slice::slice_index::range_len_len::index_mut_fail
@@ -1551,6 +1545,9 @@ slice::test_array_windows_count
 slice::test_array_windows_infer
 slice::test_array_windows_nth
 slice::test_array_windows_nth_back
+slice::test_binary_search
+slice::test_binary_search_by_overflow
+slice::test_binary_search_implementation_details
 slice::test_chunks_count
 slice::test_chunks_exact_count
 slice::test_chunks_exact_last
@@ -1577,7 +1574,6 @@ slice::test_chunks_next_back
 slice::test_chunks_nth
 slice::test_chunks_nth_back
 slice::test_chunks_zip
-slice::test_const_from_ref
 slice::test_copy_within
 slice::test_copy_within_panics_dest_too_long
 slice::test_copy_within_panics_src_inverted
@@ -1606,6 +1602,7 @@ slice::test_iterator_count
 slice::test_iterator_last
 slice::test_iterator_nth
 slice::test_iterator_nth_back
+slice::test_partition_point
 slice::test_position
 slice::test_rchunks_count
 slice::test_rchunks_exact_count
@@ -1654,6 +1651,7 @@ slice::test_windows_nth
 slice::test_windows_nth_back
 slice::test_windows_zip
 str_lossy::chunks
+str_lossy::debug
 task::poll_const
 task::waker_const
 time::abs_diff

cilly/src/basic_block.rs

@@ -1,7 +1,7 @@
 use fxhash::{FxBuildHasher, FxHashSet};
 use serde::{Deserialize, Serialize};
 
-use crate::{cil_root::CILRoot, cil_tree::CILTree};
+use crate::{cil_root::V1Root, cil_tree::CILTree};
 
 #[derive(Clone, PartialEq, Serialize, Deserialize, Debug)]
 /// A block of ops that is a valid jump target, and is protected by an exception handler.
@@ -86,7 +86,7 @@ impl BasicBlock {
             .last()
             .into_iter()
             .filter_map(|tree| match tree.root() {
-                CILRoot::GoTo { target, sub_target } => {
+                V1Root::GoTo { target, sub_target } => {
                     if *sub_target != 0 {
                         None
                     } else {
@@ -116,7 +116,7 @@ impl BasicBlock {
         handler.insert(
             0,
             Self::new(
-                vec![CILRoot::GoTo {
+                vec![V1Root::GoTo {
                     target: self.id(),
                     sub_target: *handler_id,
                 }
@@ -132,7 +132,7 @@ impl BasicBlock {
         for (target, sub_target) in targets {
             assert_eq!(*sub_target, 0);
             self.trees.push(
-                CILRoot::JumpingPad {
+                V1Root::JumpingPad {
                     target: *target,
                     source: id,
                 }
@@ -209,7 +209,7 @@ impl BasicBlock {
         self.handler.as_ref()
     }
 
-    pub(crate) fn iter_tree_roots(&self) -> impl Iterator<Item = &CILRoot> {
+    pub(crate) fn iter_tree_roots(&self) -> impl Iterator<Item = &V1Root> {
         let handler_bbs = self
             .handler
             .iter()

cilly/src/bin/linker/main.rs

@@ -343,7 +343,7 @@ fn main() {
                 MethodImpl::MethodBody {
                     blocks: vec![cilly::BasicBlock::from_v1(
                         &cilly::basic_block::BasicBlock::new(
-                            vec![cilly::cil_root::CILRoot::Throw(
+                            vec![cilly::cil_root::V1Root::Throw(
                                 cilly::cil_node::V1Node::NewObj(Box::new(
                                     cilly::cil_node::CallOpArgs {
                                         args: Box::new([conv_usize!(arg0)]),

cilly/src/cil_node.rs

@@ -6,7 +6,7 @@ use crate::v2::method::LocalDef;
 use crate::FieldDesc;
 use crate::{
     call,
-    cil_root::CILRoot,
+    cil_root::V1Root,
     hashable::{HashableF32, HashableF64},
     IString,
 };
@@ -365,9 +365,9 @@ impl V1Node {
         destination_addr: Self,
         val_desc: Interned<FieldDesc>,
         flag_desc: Interned<FieldDesc>,
-    ) -> [CILRoot; 2] {
+    ) -> [V1Root; 2] {
         // Set the value of the result.
-        let set_val = CILRoot::SetField {
+        let set_val = V1Root::SetField {
             addr: Box::new(destination_addr.clone()),
             value: Box::new(old_val),
             desc: val_desc,
@@ -382,7 +382,7 @@ impl V1Node {
 
         [
             set_val,
-            CILRoot::SetField {
+            V1Root::SetField {
                 addr: Box::new(destination_addr.clone()),
                 value: Box::new(cmp),
                 desc: flag_desc,

cilly/src/cil_root.rs

@@ -1,17 +1,18 @@
 use crate::bimap::Interned;
 use crate::cilnode::IsPure;
 use crate::cilnode::MethodKind;
+use crate::typecheck::TypeCheckError;
 use crate::v2::method::LocalDef;
 use crate::FieldDesc;
 use crate::{
     call,
-    cil_node::{V1Node, CallOpArgs},
+    cil_node::{CallOpArgs, V1Node},
     AsmString, IString,
 };
 use crate::{Assembly, ClassRef, FnSig, MethodRef, StaticFieldDesc, Type};
 use serde::{Deserialize, Serialize};
 #[derive(Clone, Eq, PartialEq, Hash, Serialize, Deserialize, Debug)]
-pub enum CILRoot {
+pub enum V1Root {
     STLoc {
         local: u32,
         tree: V1Node,
@@ -153,7 +154,16 @@ pub enum CILRoot {
     V2(Interned<crate::v2::CILRoot>),
 }
 pub type SFI = Box<(std::ops::Range<u64>, std::ops::Range<u64>, IString)>;
-impl CILRoot {
+impl V1Root {
+    pub fn try_typecheck(
+        &self,
+        asm: &mut Assembly,
+        fn_sig: Interned<FnSig>,
+        locals: &[LocalDef],
+    ) -> Result<(), TypeCheckError> {
+        let Self::V2(root) = self else { return Ok(()) };
+        asm[*root].clone().typecheck(fn_sig, locals, asm)
+    }
     #[must_use]
     pub fn throw(msg: &str, asm: &mut Assembly) -> Self {
         let class = ClassRef::exception(asm);

cilly/src/cil_tree.rs

@@ -1,15 +1,15 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{cil_root::CILRoot, v2::method::LocalDef};
+use crate::{cil_root::V1Root, v2::method::LocalDef};
 
 #[derive(Clone, PartialEq, Serialize, Deserialize, Debug)]
 /// A root of a CIL Tree with metadata about local variables it reads/writes into.  
 pub struct CILTree {
     //tree: InterCow<CILRoot>,
-    tree: CILRoot,
+    tree: V1Root,
 }
-impl From<CILRoot> for CILTree {
-    fn from(tree: CILRoot) -> Self {
+impl From<V1Root> for CILTree {
+    fn from(tree: V1Root) -> Self {
         Self {
             //tree: InterCow::new(tree),
             tree,
@@ -32,15 +32,15 @@ impl CILTree {
     }
     /// Retunrs the root of this tree.
     #[must_use]
-    pub fn root(&self) -> &CILRoot {
+    pub fn root(&self) -> &V1Root {
         &self.tree
     }
 
     /// Allocates the temporary variables this tree uses.
     pub fn allocate_tmps(&mut self, locals: &mut Vec<LocalDef>) {}
 
     // TODO: remember to make this recompute tree metadtata when it is added
-    pub fn root_mut(&mut self) -> &mut CILRoot {
+    pub fn root_mut(&mut self) -> &mut V1Root {
         //self.tree.borrow_mut()
         &mut self.tree
     }