Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto convert reference type in return type as unit type #2017

Merged
merged 6 commits into from
Jun 3, 2024
Merged

Auto convert reference type in return type as unit type #2017

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99f5bee
chore: empty
fzyzcjy Jun 3, 2024
de3e575
refactor: simp
fzyzcjy Jun 3, 2024
6a6a65b
feat: more
fzyzcjy Jun 3, 2024
9e252ce
fix: err
fzyzcjy Jun 3, 2024
f02b8df
chore: log
fzyzcjy Jun 3, 2024
6825347
Merge branch 'master' into feat/12129
fzyzcjy Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions frb_codegen/src/library/codegen/parser/mir/function_parser/output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use crate::codegen::ir::mir::func::OwnershipMode;
use crate::codegen::ir::mir::ty::primitive::MirTypePrimitive;
use crate::codegen::ir::mir::ty::rust_auto_opaque_implicit::MirTypeRustAutoOpaqueImplicit;
use crate::codegen::ir::mir::ty::MirType;
use crate::codegen::parser::mir::function_parser::{FunctionParser, FunctionPartialInfo};
use crate::codegen::parser::mir::type_parser::result::parse_type_maybe_result;
Expand All @@ -12,9 +14,9 @@ impl<'a, 'b> FunctionParser<'a, 'b> {
context: &TypeParserParsingContext,
) -> anyhow::Result<FunctionPartialInfo> {
Ok(match &sig.output {
ReturnType::Type(_, ty) => {
remove_primitive_unit(self.parse_fn_output_type(ty, context)?)
}
ReturnType::Type(_, ty) => remove_reference_type(remove_primitive_unit(
self.parse_fn_output_type(ty, context)?,
)),
ReturnType::Default => Default::default(),
})
}
Expand All @@ -37,11 +39,28 @@ impl<'a, 'b> FunctionParser<'a, 'b> {

// Convert primitive Unit type -> None
fn remove_primitive_unit(info: FunctionPartialInfo) -> FunctionPartialInfo {
let ok_output = if info.ok_output == Some(MirType::Primitive(MirTypePrimitive::Unit)) {
None
} else {
info.ok_output
};
if info.ok_output == Some(MirType::Primitive(MirTypePrimitive::Unit)) {
return FunctionPartialInfo {
ok_output: None,
..info
};
}
info
}

FunctionPartialInfo { ok_output, ..info }
fn remove_reference_type(info: FunctionPartialInfo) -> FunctionPartialInfo {
if let Some(MirType::RustAutoOpaqueImplicit(MirTypeRustAutoOpaqueImplicit {
ownership_mode,
..
})) = &info.ok_output
{
if *ownership_mode != OwnershipMode::Owned {
log::debug!("remove_reference_type: detect output type is a reference, thus set to unit (info={:?})", info);
return FunctionPartialInfo {
ok_output: None,
..info
};
}
}
info
}
Loading