Skip to content

[flang] Improve error message with declaration #87294

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
Apr 8, 2024
Merged

[flang] Improve error message with declaration #87294

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
19 changes: 11 additions & 8 deletions flang/include/flang/Parser/char-block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,20 @@ class CharBlock {
// "memcmp" in glibc has "nonnull" attributes on the input pointers.
// Avoid passing null pointers, since it would result in an undefined
// behavior.
if (size() == 0)
if (size() == 0) {
return that.size() == 0 ? 0 : -1;
if (that.size() == 0)
} else if (that.size() == 0) {
return 1;
std::size_t bytes{std::min(size(), that.size())};
int cmp{std::memcmp(static_cast<const void *>(begin()),
static_cast<const void *>(that.begin()), bytes)};
if (cmp != 0) {
return cmp;
} else {
std::size_t bytes{std::min(size(), that.size())};
int cmp{std::memcmp(static_cast<const void *>(begin()),
static_cast<const void *>(that.begin()), bytes)};
if (cmp != 0) {
return cmp;
} else {
return size() < that.size() ? -1 : size() > that.size();
}
}
return size() < that.size() ? -1 : size() > that.size();
}

int Compare(const char *that) const {
Expand Down
4 changes: 2 additions & 2 deletions flang/lib/Semantics/resolve-names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2250,7 +2250,7 @@ void ScopeHandler::SayWithDecl(
const parser::Name &name, Symbol &symbol, MessageFixedText &&msg) {
bool isFatal{msg.IsFatal()};
Say(name, std::move(msg), symbol.name())
.Attach(Message{name.source,
.Attach(Message{symbol.name(),
symbol.test(Symbol::Flag::Implicit)
? "Implicit declaration of '%s'"_en_US
: "Declaration of '%s'"_en_US,
Expand Down Expand Up @@ -7840,7 +7840,7 @@ const parser::Name *DeclarationVisitor::FindComponent(
auto &symbol{base->symbol->GetUltimate()};
if (!symbol.has<AssocEntityDetails>() && !ConvertToObjectEntity(symbol)) {
SayWithDecl(*base, symbol,
"'%s' is an invalid base for a component reference"_err_en_US);
"'%s' is not an object and may not be used as the base of a component reference or type parameter inquiry"_err_en_US);
return nullptr;
}
auto *type{symbol.GetType()};
Expand Down
6 changes: 3 additions & 3 deletions flang/test/Semantics/resolve21.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ subroutine s1
external :: w
!ERROR: 'z' is not an object of derived type; it is implicitly typed
i = z%i
!ERROR: 's1' is an invalid base for a component reference
!ERROR: 's1' is not an object and may not be used as the base of a component reference or type parameter inquiry
i = s1%i
!ERROR: 'j' is not an object of derived type
i = j%i
!ERROR: Component 'j' not found in derived type 't'
i = x%j
!ERROR: 'v' is an invalid base for a component reference
!ERROR: 'v' is not an object and may not be used as the base of a component reference or type parameter inquiry
i = v%i
!ERROR: 'w' is an invalid base for a component reference
!ERROR: 'w' is not an object and may not be used as the base of a component reference or type parameter inquiry
i = w%i
i = x%i !OK
end subroutine
Expand Down