PR fixes

Author: xunilrj

sway-core/src/language/ty/expression/expression_variant.rs

@@ -1330,13 +1330,6 @@ impl TypeCheckFinalization for TyExpressionVariant {
                     for expr in kind.arguments.iter_mut() {
                         expr.type_check_finalize(handler, ctx)?;
                     }
-
-                    if let sway_ast::Intrinsic::EnumVariantsValues = kind.kind {
-                        eprintln!(
-                            "type_check_finalize: {:?}",
-                            ctx.engines.help_out(&kind.type_arguments)
-                        );
-                    }
                 }
                 TyExpressionVariant::AbiName(_) => {
                     todo!("")

sway-core/src/lib.rs

@@ -1198,10 +1198,6 @@ pub fn compile_to_asm(
         experimental,
     )?;
 
-    if let Ok(t) = ast_res.typed.as_ref() {
-        dbg!(&t.decls_to_check);
-    }
-
     ast_to_asm(handler, engines, &ast_res, build_config, experimental)
 }
 

sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs

@@ -187,7 +187,7 @@ fn type_check_enum_variants_values(
     if arguments.len() != 1 {
         return Err(handler.emit_err(CompileError::IntrinsicIncorrectNumArgs {
             name: kind.to_string(),
-            expected: 0,
+            expected: 1,
             span,
         }));
     }
@@ -200,7 +200,7 @@ fn type_check_enum_variants_values(
 
     let _value_id = match first_argument_typed_expr.expression {
         ty::TyExpressionVariant::Literal(Literal::U64(3)) => 3,
-        _ => todo!(),
+        _ => return Err(handler.emit_err(CompileError::InvalidArgument { span: first_argument_typed_expr.span })),
     };
 
     let arguments = vec![first_argument_typed_expr];
@@ -232,16 +232,6 @@ fn type_check_enum_variants_values(
     };
     let return_type = ctx.engines.te().insert_slice(ctx.engines, elem_type);
 
-    match &*ctx.engines.te().get(arg) {
-        TypeInfo::UnknownGeneric { .. } => {}
-        TypeInfo::Enum(_) => {
-            todo!();
-        }
-        _ => {
-            todo!()
-        }
-    };
-
     let mut final_type_arguments = type_arguments.to_vec();
     *final_type_arguments[0].type_id_mut() = arg;
 

sway-error/src/error.rs

@@ -501,6 +501,8 @@ pub enum CompileError {
     },
     #[error("This opcode takes an immediate value but none was provided.")]
     MissingImmediate { span: Span },
+    #[error("Invalid argument.")]
+    InvalidArgument { span: Span },
     #[error("This immediate value is invalid.")]
     InvalidImmediateValue { span: Span },
     #[error("Variant \"{variant_name}\" does not exist on enum \"{enum_name}\"")]
@@ -1370,6 +1372,7 @@ impl Spanned for CompileError {
             IndexedFieldOffsetTooLarge { field_name } => field_name.span(),
             IncoherentImplDueToOrphanRule { span, .. } => span.clone(),
             TrivialCheckFailed { span, .. } => span.clone(),
+            InvalidArgument { span } => span.clone(),
         }
     }
 }

sway-lib-std/src/codec.sw

@@ -6905,10 +6905,10 @@ fn trivial_bool_when_valid() {
     assert_encoding(b, [0u8, 0, 0, 0, 0, 0, 0, 1]);
 }
 
-#[test(should_revert)]
+#[test]
 fn trivial_bool_when_invalid_is_valid() {
-    let slice = encode(TrivialBool { value: 2 });
-    let _ = abi_decode::<TrivialBool>(slice).unwrap();
+    let bytes = encode(TrivialBool { value: 2 });
+    assert_eq(abi_decode::<TrivialBool>(bytes).is_valid(), false, 0);
 }
 
 #[test(should_revert)]
@@ -6934,9 +6934,12 @@ where
         let discriminant: u64 = abi_decode::<u64>(discriminant);
 
         let is_decode_trivial_table = T::is_decode_trivial_table();
-        let a: bool = *__elem_at(is_decode_trivial_table, discriminant);
-        
-        discriminant < is_decode_trivial_table.len() && a
+
+        if discriminant < is_decode_trivial_table.len() {
+            *__elem_at(is_decode_trivial_table, discriminant)
+        } else {
+            false
+        }
     }
 
     pub fn unwrap(self) -> T {