[flang] Fix crash in defined I/O table creation #173783
Open
+41
−7
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 code that handles non-type-bound defined I/O for sequence types didn't allow for the type to be shadowed in its scope by a homonymous generic procedure interface. Fixes llvm#173766.
llvmbot
added
flang
Member
|
@llvm/pr-subscribers-flang-fir-hlfir Author: Peter Klausler (klausler) ChangesThe code that handles non-type-bound defined I/O for sequence types didn't allow for the type to be shadowed in its scope by a homonymous generic procedure interface. Fixes #173766. Full diff: https://github.com/llvm/llvm-project/pull/173783.diff 2 Files Affected:
diff --git a/flang/lib/Semantics/runtime-type-info.cpp b/flang/lib/Semantics/runtime-type-info.cpp
index bbaded36c62e3..8f92fda65685a 100644
--- a/flang/lib/Semantics/runtime-type-info.cpp
+++ b/flang/lib/Semantics/runtime-type-info.cpp
@@ -1394,13 +1394,19 @@ CollectNonTbpDefinedIoGenericInterfaces(
// scope has an equivalent type, use it for the table rather
// than the "dtv" argument's type.
if (const Symbol *inScope{scope.FindSymbol(derived.name())}) {
- const Symbol &ultimate{inScope->GetUltimate()};
- DerivedTypeSpec localDerivedType{inScope->name(), ultimate};
- if (ultimate.has<DerivedTypeDetails>() &&
- evaluate::DynamicType{derived, /*isPolymorphic=*/false}
- .IsTkCompatibleWith(evaluate::DynamicType{
- localDerivedType, /*iP=*/false})) {
- derivedScope = ultimate.scope();
+ const Symbol *localDerived{&inScope->GetUltimate()};
+ if (const auto *generic{
+ localDerived->detailsIf<GenericDetails>()}) {
+ localDerived = generic->derivedType();
+ }
+ if (localDerived && localDerived->has<DerivedTypeDetails>()) {
+ DerivedTypeSpec localDerivedType{
+ inScope->name(), *localDerived};
+ if (evaluate::DynamicType{derived, /*isPolymorphic=*/false}
+ .IsTkCompatibleWith(evaluate::DynamicType{
+ localDerivedType, /*iP=*/false})) {
+ derivedScope = localDerived->scope();
+ }
}
}
}
diff --git a/flang/test/Lower/bug173766.f90 b/flang/test/Lower/bug173766.f90
new file mode 100644
index 0000000000000..a9705f144c563
--- /dev/null
+++ b/flang/test/Lower/bug173766.f90
@@ -0,0 +1,28 @@
+!RUN: bbc -emit-fir -o - %s 2>&1 | FileCheck %s
+module m
+ type samename
+ sequence
+ integer n
+ end type
+ interface samename
+ end interface
+ interface write(formatted)
+ module procedure :: write_formatted
+ end interface
+ contains
+ subroutine write_formatted(t, unit, iotype, v_list, iostat, iomsg)
+ type(samename), intent(in) :: t
+ integer, intent(in) :: unit
+ character(len=*), intent(in) :: iotype
+ integer, intent(in) :: v_list(:)
+ integer, intent(out) :: iostat
+ character(len=*), intent(inout) :: iomsg
+ end
+ subroutine test
+ print *, samename(123)
+ end
+end
+
+!CHECK: %[[VAL_8:.*]] = fir.address_of(@_QQMmFtest.nonTbpDefinedIoTable) : !fir.ref<tuple<i64, !fir.ref<!fir.array<1xtuple<!fir.ref<none>, !fir.ref<none>, i32, i8>>>, i1>>
+!CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<tuple<i64, !fir.ref<!fir.array<1xtuple<!fir.ref<none>, !fir.ref<none>, i32, i8>>>, i1>>) -> !fir.ref<none>
+!CHECK: %{{.*}} = fir.call @_FortranAioOutputDerivedType(%{{.*}}, %{{.*}}, %[[VAL_9]]) fastmath<contract> : (!fir.ref<i8>, !fir.box<none>, !fir.ref<none>) -> i1
|
Member
|
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) ChangesThe code that handles non-type-bound defined I/O for sequence types didn't allow for the type to be shadowed in its scope by a homonymous generic procedure interface. Fixes #173766. Full diff: https://github.com/llvm/llvm-project/pull/173783.diff 2 Files Affected:
diff --git a/flang/lib/Semantics/runtime-type-info.cpp b/flang/lib/Semantics/runtime-type-info.cpp
index bbaded36c62e3..8f92fda65685a 100644
--- a/flang/lib/Semantics/runtime-type-info.cpp
+++ b/flang/lib/Semantics/runtime-type-info.cpp
@@ -1394,13 +1394,19 @@ CollectNonTbpDefinedIoGenericInterfaces(
// scope has an equivalent type, use it for the table rather
// than the "dtv" argument's type.
if (const Symbol *inScope{scope.FindSymbol(derived.name())}) {
- const Symbol &ultimate{inScope->GetUltimate()};
- DerivedTypeSpec localDerivedType{inScope->name(), ultimate};
- if (ultimate.has<DerivedTypeDetails>() &&
- evaluate::DynamicType{derived, /*isPolymorphic=*/false}
- .IsTkCompatibleWith(evaluate::DynamicType{
- localDerivedType, /*iP=*/false})) {
- derivedScope = ultimate.scope();
+ const Symbol *localDerived{&inScope->GetUltimate()};
+ if (const auto *generic{
+ localDerived->detailsIf<GenericDetails>()}) {
+ localDerived = generic->derivedType();
+ }
+ if (localDerived && localDerived->has<DerivedTypeDetails>()) {
+ DerivedTypeSpec localDerivedType{
+ inScope->name(), *localDerived};
+ if (evaluate::DynamicType{derived, /*isPolymorphic=*/false}
+ .IsTkCompatibleWith(evaluate::DynamicType{
+ localDerivedType, /*iP=*/false})) {
+ derivedScope = localDerived->scope();
+ }
}
}
}
diff --git a/flang/test/Lower/bug173766.f90 b/flang/test/Lower/bug173766.f90
new file mode 100644
index 0000000000000..a9705f144c563
--- /dev/null
+++ b/flang/test/Lower/bug173766.f90
@@ -0,0 +1,28 @@
+!RUN: bbc -emit-fir -o - %s 2>&1 | FileCheck %s
+module m
+ type samename
+ sequence
+ integer n
+ end type
+ interface samename
+ end interface
+ interface write(formatted)
+ module procedure :: write_formatted
+ end interface
+ contains
+ subroutine write_formatted(t, unit, iotype, v_list, iostat, iomsg)
+ type(samename), intent(in) :: t
+ integer, intent(in) :: unit
+ character(len=*), intent(in) :: iotype
+ integer, intent(in) :: v_list(:)
+ integer, intent(out) :: iostat
+ character(len=*), intent(inout) :: iomsg
+ end
+ subroutine test
+ print *, samename(123)
+ end
+end
+
+!CHECK: %[[VAL_8:.*]] = fir.address_of(@_QQMmFtest.nonTbpDefinedIoTable) : !fir.ref<tuple<i64, !fir.ref<!fir.array<1xtuple<!fir.ref<none>, !fir.ref<none>, i32, i8>>>, i1>>
+!CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<tuple<i64, !fir.ref<!fir.array<1xtuple<!fir.ref<none>, !fir.ref<none>, i32, i8>>>, i1>>) -> !fir.ref<none>
+!CHECK: %{{.*}} = fir.call @_FortranAioOutputDerivedType(%{{.*}}, %{{.*}}, %[[VAL_9]]) fastmath<contract> : (!fir.ref<i8>, !fir.box<none>, !fir.ref<none>) -> i1
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The code that handles non-type-bound defined I/O for sequence types didn't allow for the type to be shadowed in its scope by a homonymous generic procedure interface.
Fixes #173766.