Skip to content

[flang] Check assignment conformance for derived types #99059

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.

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
merged 1 commit into from
Jul 18, 2024

Conversation

klausler
Copy link
Contributor

Derived type assignment checking needs to account for the possibility of derived assignment. The implementation was checking compile-time conformance errors only on the path for assignments of intrinsic types. Add a static array conformance check in the derived type flow once it has been established that no defined assignment exists.

Fixes #98981.

Derived type assignment checking needs to account for
the possibility of derived assignment.  The implementation
was checking compile-time conformance errors only on the
path for assignments of intrinsic types.  Add a static array
conformance check in the derived type flow once it has been
established that no defined assignment exists.

Fixes llvm#98981.
@klausler klausler requested a review from psteinfeld July 16, 2024 16:34
@llvmbot llvmbot added flang Flang issues not falling into any other category flang:semantics labels Jul 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Jul 16, 2024

@llvm/pr-subscribers-flang-semantics

Author: Peter Klausler (klausler)

Changes

Derived type assignment checking needs to account for the possibility of derived assignment. The implementation was checking compile-time conformance errors only on the path for assignments of intrinsic types. Add a static array conformance check in the derived type flow once it has been established that no defined assignment exists.

Fixes #98981.


Full diff: https://github.com/llvm/llvm-project/pull/99059.diff

3 Files Affected:

  • (modified) flang/lib/Semantics/expression.cpp (+2)
  • (modified) flang/test/Semantics/array-constr-values.f90 (+2)
  • (modified) flang/test/Semantics/assign10.f90 (+6)
diff --git a/flang/lib/Semantics/expression.cpp b/flang/lib/Semantics/expression.cpp
index 2d91962a24a4c..4413d77fcf255 100644
--- a/flang/lib/Semantics/expression.cpp
+++ b/flang/lib/Semantics/expression.cpp
@@ -4533,6 +4533,8 @@ std::optional<ProcedureRef> ArgumentAnalyzer::TryDefinedAssignment() {
         !OkLogicalIntegerAssignment(lhsType->category(), rhsType->category())) {
       SayNoMatch("ASSIGNMENT(=)", true);
     }
+  } else if (!fatalErrors_) {
+    CheckAssignmentConformance();
   }
   return std::nullopt;
 }
diff --git a/flang/test/Semantics/array-constr-values.f90 b/flang/test/Semantics/array-constr-values.f90
index b93f774e0b0d0..6742cd35fe52d 100644
--- a/flang/test/Semantics/array-constr-values.f90
+++ b/flang/test/Semantics/array-constr-values.f90
@@ -35,8 +35,10 @@ subroutine arrayconstructorvalues()
   intarray = [integer:: EMPLOYEE (19, "Jack"), 2, 3, 4, 5]
 
   ! C7112
+  !ERROR: Dimension 1 of left-hand side has extent 3, but right-hand side has extent 2
   !ERROR: Value in array constructor of type 'INTEGER(4)' could not be converted to the type of the array 'employee'
   emparray = (/ EMPLOYEE:: EMPLOYEE(19, "Ganesh"), EMPLOYEE(22, "Omkar"), 19 /)
+  !ERROR: Dimension 1 of left-hand side has extent 3, but right-hand side has extent 2
   !ERROR: Value in array constructor of type 'employeer' could not be converted to the type of the array 'employee'
   emparray = (/ EMPLOYEE:: EMPLOYEE(19, "Ganesh"), EMPLOYEE(22, "Ram"),EMPLOYEER("ShriniwasPvtLtd") /)
 
diff --git a/flang/test/Semantics/assign10.f90 b/flang/test/Semantics/assign10.f90
index 6b98097bfe62c..f0ea4b251a6d6 100644
--- a/flang/test/Semantics/assign10.f90
+++ b/flang/test/Semantics/assign10.f90
@@ -1,7 +1,11 @@
 ! RUN: %python %S/test_errors.py %s %flang_fc1
 ! Shape conformance checks on assignments
 program test
+  type t
+    integer n
+  end type
   real :: a0, a1a(2), a1b(3), a2a(2,3), a2b(3,2)
+  type(t) c(10)
   a0 = 0. ! ok
   !ERROR: No intrinsic or user-defined ASSIGNMENT(=) matches scalar REAL(4) and rank 1 array of REAL(4)
   a0 = [0.]
@@ -20,4 +24,6 @@ program test
   a2a(1,:) = a1a
   !ERROR: Dimension 1 of left-hand side has extent 2, but right-hand side has extent 3
   a2a = a2b
+  !ERROR: Dimension 1 of left-hand side has extent 10, but right-hand side has extent 0
+  c(1:10) = c(10:1)
 end

Copy link
Contributor

@psteinfeld psteinfeld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All builds and tests correctly and looks good.

@klausler klausler merged commit 6c09a9b into llvm:main Jul 18, 2024
10 checks passed
@klausler klausler deleted the bug98981 branch July 18, 2024 22:57
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
Summary:
Derived type assignment checking needs to account for the possibility of
derived assignment. The implementation was checking compile-time
conformance errors only on the path for assignments of intrinsic types.
Add a static array conformance check in the derived type flow once it
has been established that no defined assignment exists.

Fixes #98981.

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250780
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flang:semantics flang Flang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Flang] No error checking when array intrinsic assignment uses an array of derived type with a different shape
3 participants