Skip to content

Commit 52aebd2

Browse files
authored
Merge pull request #236 from flang-compiler/tsk-altreturns
Fix spelling of hasAlternateReturns
2 parents 54e67ef + 2914d28 commit 52aebd2

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

flang/lib/Lower/CallInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
//===----------------------------------------------------------------------===//
2323

2424
bool Fortran::lower::CallerInterface::hasAlternateReturns() const {
25-
return procRef.HasAlternateReturns();
25+
return procRef.hasAlternateReturns();
2626
}
2727

2828
std::string Fortran::lower::CallerInterface::getMangledName() const {

flang/lib/Lower/ConvertExpr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ class ExprLowering {
13411341

13421342
fir::ExtendedValue genval(const Fortran::evaluate::ProcedureRef &procRef) {
13431343
llvm::SmallVector<mlir::Type, 1> resTy;
1344-
if (procRef.HasAlternateReturns())
1344+
if (procRef.hasAlternateReturns())
13451345
resTy.push_back(builder.getIndexType());
13461346
return genProcedureRef(procRef, resTy);
13471347
}

flang/lib/Semantics/expression.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,9 +2011,6 @@ void ExpressionAnalyzer::Analyze(const parser::CallStmt &callStmt) {
20112011
analyzer.Analyze(arg, true /* is subroutine call */);
20122012
}
20132013
if (!analyzer.fatalErrors()) {
2014-
// An alternate return specifier actual argument has no code in the call.
2015-
bool hasAlternateReturns{
2016-
analyzer.GetActuals().size() < actualArgList.size()};
20172014
if (std::optional<CalleeAndArguments> callee{
20182015
GetCalleeAndArguments(std::get<parser::ProcedureDesignator>(call.t),
20192016
analyzer.GetActuals(), true /* subroutine */)}) {

0 commit comments

Comments
 (0)