Skip to content

Dftatom: Changes from lfortran LibASR #2334

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

Merged
certik merged 3 commits into from
Sep 22, 2023
Merged

Dftatom: Changes from lfortran LibASR #2334

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6733b67
PASS: Use array_op on struct_inst_mem
ubaidsk Sep 22, 2023
c396abc
struct_inst_mem in pass_subroutine_from_function()
ubaidsk Sep 22, 2023
58da39c
PASS: Handle bounds for arr mem in struct
ubaidsk Sep 22, 2023
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
Next Next commit
PASS: Use array_op on struct_inst_mem 
Also simplify the condition
  • Loading branch information
@ubaidsk
ubaidsk committed Sep 22, 2023
commit 6733b6715b79d91d03f138fa7c2fb3b78fbaa4c3
66 changes: 29 additions & 37 deletions src/libasr/pass/array_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,47 +1460,39 @@ class ArrayOpVisitor : public ASR::CallReplacerOnExpressionsVisitor<ArrayOpVisit
}

void visit_Assignment(const ASR::Assignment_t &x) {
bool is_target_struct_member_array_and_value_array =
(ASR::is_a<ASR::StructInstanceMember_t>(*x.m_target) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_value)) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_target)) &&
!ASR::is_a<ASR::FunctionCall_t>(*x.m_value));
if( (ASR::is_a<ASR::Pointer_t>(*ASRUtils::expr_type(x.m_target)) &&
ASR::is_a<ASR::GetPointer_t>(*x.m_value)) ||
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value)) ||
is_target_struct_member_array_and_value_array) { // TODO: fix for StructInstanceMember targets
if( is_target_struct_member_array_and_value_array ) {
if (realloc_lhs && ASRUtils::is_allocatable(x.m_target)) { // Add realloc-lhs later
Vec<ASR::alloc_arg_t> vec_alloc;
vec_alloc.reserve(al, 1);
ASR::alloc_arg_t alloc_arg;
alloc_arg.m_len_expr = nullptr;
alloc_arg.m_type = nullptr;
alloc_arg.loc = x.m_target->base.loc;
alloc_arg.m_a = x.m_target;


ASR::dimension_t* m_dims = nullptr;
size_t n_dims = ASRUtils::extract_dimensions_from_ttype(
ASRUtils::expr_type(x.m_value), m_dims);
Vec<ASR::dimension_t> vec_dims;
vec_dims.reserve(al, n_dims);
for( size_t i = 0; i < n_dims; i++ ) {
ASR::dimension_t dim;
dim.loc = x.m_value->base.loc;
dim.m_start = PassUtils::get_bound(x.m_value, i + 1, "lbound", al);
dim.m_length = ASRUtils::get_size(x.m_value, i + 1, al);
vec_dims.push_back(al, dim);
}
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value)) ) {
if( realloc_lhs && ASRUtils::is_allocatable(x.m_target)) { // Add realloc-lhs later
Vec<ASR::alloc_arg_t> vec_alloc;
vec_alloc.reserve(al, 1);
ASR::alloc_arg_t alloc_arg;
alloc_arg.m_len_expr = nullptr;
alloc_arg.m_type = nullptr;
alloc_arg.loc = x.m_target->base.loc;
alloc_arg.m_a = x.m_target;


ASR::dimension_t* m_dims = nullptr;
size_t n_dims = ASRUtils::extract_dimensions_from_ttype(
ASRUtils::expr_type(x.m_value), m_dims);
Vec<ASR::dimension_t> vec_dims;
vec_dims.reserve(al, n_dims);
for( size_t i = 0; i < n_dims; i++ ) {
ASR::dimension_t dim;
dim.loc = x.m_value->base.loc;
dim.m_start = PassUtils::get_bound(x.m_value, i + 1, "lbound", al);
dim.m_length = ASRUtils::get_size(x.m_value, i + 1, al);
vec_dims.push_back(al, dim);
}


alloc_arg.m_dims = vec_dims.p;
alloc_arg.n_dims = vec_dims.n;
vec_alloc.push_back(al, alloc_arg);
pass_result.push_back(al, ASRUtils::STMT(ASR::make_Allocate_t(
al, x.base.base.loc, vec_alloc.p, 1, nullptr, nullptr, nullptr)));
remove_original_statement = false;
}
alloc_arg.m_dims = vec_dims.p;
alloc_arg.n_dims = vec_dims.n;
vec_alloc.push_back(al, alloc_arg);
pass_result.push_back(al, ASRUtils::STMT(ASR::make_Allocate_t(
al, x.base.base.loc, vec_alloc.p, 1, nullptr, nullptr, nullptr)));
remove_original_statement = false;
}
return ;
}
Expand Down