Skip to content

[flang] Avoid crash in name resolution on erroneous type extension #109312

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
merged 1 commit into from
Sep 20, 2024
Merged

[flang] Avoid crash in name resolution on erroneous type extension #109312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions flang/lib/Semantics/resolve-names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ class DeclarationVisitor : public ArraySpecVisitor,
const parser::Name &, const parser::Name *);
Symbol *MakeTypeSymbol(const SourceName &, Details &&);
Symbol *MakeTypeSymbol(const parser::Name &, Details &&);
bool OkToAddComponent(const parser::Name &, const Symbol * = nullptr);
bool OkToAddComponent(const parser::Name &, const Symbol *extends = nullptr);
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this update intentional? I don't see it being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I added an argument name for documentation purposes.

ParamValue GetParamValue(
const parser::TypeParamValue &, common::TypeParamAttr attr);
void CheckCommonBlockDerivedType(
Expand Down Expand Up @@ -5606,7 +5606,7 @@ void DeclarationVisitor::Post(const parser::DerivedTypeStmt &x) {
comp.set(Symbol::Flag::ParentComp);
DeclTypeSpec &type{currScope().MakeDerivedType(
DeclTypeSpec::TypeDerived, std::move(*extendsType))};
type.derivedTypeSpec().set_scope(*extendsSymbol.scope());
type.derivedTypeSpec().set_scope(DEREF(extendsSymbol.scope()));
comp.SetType(type);
DerivedTypeDetails &details{symbol.get<DerivedTypeDetails>()};
details.add_component(comp);
Expand Down Expand Up @@ -6797,15 +6797,20 @@ std::optional<DerivedTypeSpec> DeclarationVisitor::ResolveDerivedType(

std::optional<DerivedTypeSpec> DeclarationVisitor::ResolveExtendsType(
const parser::Name &typeName, const parser::Name *extendsName) {
if (!extendsName) {
return std::nullopt;
} else if (typeName.source == extendsName->source) {
Say(extendsName->source,
"Derived type '%s' cannot extend itself"_err_en_US);
return std::nullopt;
} else {
return ResolveDerivedType(*extendsName);
if (extendsName) {
if (typeName.source == extendsName->source) {
Say(extendsName->source,
"Derived type '%s' cannot extend itself"_err_en_US);
} else if (auto dtSpec{ResolveDerivedType(*extendsName)}) {
if (!dtSpec->IsForwardReferenced()) {
return dtSpec;
}
Say(typeName.source,
"Derived type '%s' cannot extend type '%s' that has not yet been defined"_err_en_US,
typeName.source, extendsName->source);
}
}
return std::nullopt;
}

Symbol *DeclarationVisitor::NoteInterfaceName(const parser::Name &name) {
Expand Down
15 changes: 15 additions & 0 deletions flang/test/Semantics/bad-forward-type.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,18 @@ subroutine s10
type(undef), pointer :: y
end type
end subroutine s10

subroutine s11
!ERROR: Derived type 'undef1' not found
type(undef1), pointer :: p
type t1
!ERROR: The derived type 'undef2' has not been defined
type(undef2), pointer :: p
end type
!ERROR: Derived type 'undef1' not found
type, extends(undef1) :: t2
end type
!ERROR: Derived type 't3' cannot extend type 'undef2' that has not yet been defined
type, extends(undef2) :: t3
end type
end subroutine s11
Loading