try method #1

FuelLabs · Oct 11, 2022 · 090a4d1 · 090a4d1
1 parent 58624f9
commit 090a4d1
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/sway-core/src/asm_generation/checks.rs b/sway-core/src/asm_generation/checks.rs
@@ -7,6 +7,7 @@ use crate::asm_lang::*;
 use crate::error::*;
 
 use sway_error::error::CompileError;
+use sway_ir::*;
 
 /// Checks for disallowed opcodes in non-contract code.
 /// i.e., if this is a script or predicate, we can't use certain contract opcodes.
@@ -74,3 +75,42 @@ fn check_for_contract_opcodes(ops: &[AllocatedOp]) -> CompileResult<()> {
         err(vec![], errors)
     }
 }
+
+pub fn check_invalid_return(ir: &Context, module: &Module) -> CompileResult<()> {
+    let default_span = sway_types::span::Span::new("no span found".into(), 0, 1, None).unwrap();
+    match module.get_kind(ir) {
+        Kind::Contract | Kind::Library => ok((), vec![], vec![]),
+        Kind::Predicate | Kind::Script => {
+            let entry_point_function = module
+                .function_iter(ir)
+                .find(|func| {
+                    func.get_name(ir) == sway_types::constants::DEFAULT_ENTRY_POINT_FN_NAME
+                })
+                .unwrap();
+
+            let ret_ty = entry_point_function.get_return_type(ir);
+
+            if type_has_ptr(ir, &ret_ty) {
+                err(
+                    vec![],
+                    vec![CompileError::PointerReturnNotAllowedInMain { span: default_span }],
+                )
+            } else {
+                ok((), vec![], vec![])
+            }
+        }
+    }
+}
+
+fn type_has_ptr(ir: &Context, ty: &Type) -> bool {
+    match ty {
+        Type::Pointer(_) => true,
+        Type::Array(aggregate) | Type::Union(aggregate) | Type::Struct(aggregate) => {
+            match aggregate.get_content(ir) {
+                AggregateContent::ArrayType(ty, _) => type_has_ptr(ir, ty),
+                AggregateContent::FieldTypes(tys) => tys.iter().any(|ty| type_has_ptr(ir, ty)),
+            }
+        }
+        _ => false,
+    }
+}
diff --git a/sway-core/src/asm_generation/from_ir.rs b/sway-core/src/asm_generation/from_ir.rs
@@ -1,6 +1,6 @@
 use super::{
     asm_builder::AsmBuilder,
-    checks::check_invalid_opcodes,
+    checks::{check_invalid_opcodes, check_invalid_return},
     finalized_asm::FinalizedAsm,
     programs::{AbstractProgram, ProgramKind},
     register_sequencer::RegisterSequencer,
@@ -26,6 +26,14 @@ pub fn compile_ir_to_asm(
     let mut errors: Vec<CompileError> = Vec::new();
 
     let module = ir.module_iter().next().unwrap();
+
+    check!(
+        check_invalid_return(ir, &module),
+        return err(warnings, errors),
+        warnings,
+        errors
+    );
+
     let abstract_program = check!(
         compile_module_to_asm(RegisterSequencer::new(), ir, module),
         return err(warnings, errors),