release/21.x: [Flang] Fix crash with parametrized derived types usage (#150289) #151937
+31
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current mangleName implementation doesn't take a FoldingContext, which prevents the proper evaluation of expressions containing parameter references to an integer constant. Since parametrized derived types are not yet implemented, the compiler will crash there in some cases (see example in issue llvm#127424). This is a workaround so that doesn't happen until the feature is properly implemented. Fixes llvm#127424 (cherry picked from commit 89e4d9f)
|
@tblah What do you think about merging this PR to the release branch? |
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir Author: None (llvmbot) ChangesBackport 89e4d9f Requested by: @tblah Full diff: https://github.com/llvm/llvm-project/pull/151937.diff 2 Files Affected:
diff --git a/flang/lib/Lower/Mangler.cpp b/flang/lib/Lower/Mangler.cpp
index 1333e3fe349d1..e1ae86a1b5bb2 100644
--- a/flang/lib/Lower/Mangler.cpp
+++ b/flang/lib/Lower/Mangler.cpp
@@ -224,8 +224,18 @@ std::string Fortran::lower::mangle::mangleName(
assert(paramExpr && "derived type kind param not explicit");
std::optional<int64_t> init =
Fortran::evaluate::ToInt64(paramValue->GetExplicit());
- assert(init && "derived type kind param is not constant");
- kinds.emplace_back(*init);
+ // TODO: put the assertion check back when parametrized derived types
+ // are supported:
+ // assert(init && "derived type kind param is not constant");
+ //
+ // The init parameter above will require a FoldingContext for proper
+ // expression evaluation to an integer constant, otherwise the
+ // compiler may crash here (see example in issue #127424).
+ if (!init) {
+ TODO_NOLOC("parameterized derived types");
+ } else {
+ kinds.emplace_back(*init);
+ }
}
}
return fir::NameUniquer::doType(modules, procs, blockId, symbolName, kinds);
diff --git a/flang/test/Lower/parametrized-derived-types.f90 b/flang/test/Lower/parametrized-derived-types.f90
new file mode 100644
index 0000000000000..97a40c9169d2b
--- /dev/null
+++ b/flang/test/Lower/parametrized-derived-types.f90
@@ -0,0 +1,19 @@
+! RUN: %python %S/test_errors.py %s %flang_fc1
+! XFAIL: *
+program main
+ TYPE ty(k1,k2)
+ INTEGER ,KIND::k1,k2=5
+ INTEGER::arr(k1:k2)=10
+ CHARACTER(LEN=k2)::CHARACTER
+ END TYPE ty
+ TYPE,EXTENDS(ty)::ty1(k3)
+ INTEGER,KIND ::k3=4
+ TYPE(ty(2,k3+1))::cmp_ty = ty(2,k3+1)(55,'HI')
+ END TYPE ty1
+ TYPE ty2(l1, l2)
+ !ERROR: not yet implemented: parameterized derived types
+ INTEGER,LEN ::l1,l2
+ TYPE(ty1(2,5)), ALLOCATABLE::ty1_cmp(:)
+ END TYPE ty2
+ TYPE(ty2(4,8)) ::ty2_obj
+end program main
|
|
Needs to be reviewed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 89e4d9f
Requested by: @tblah