commit e85c76734de4589f58a26b88b1d808e47ff0ad5f
author peter klausler <pklausler@nvidia.com> Thu Jan 21 14:59:43 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Sun Jan 24 20:46:48 2021 -0800
tree 5ce6b4f20a67cf90b5a881ad27ca3867081b8c2f
parent a8782cc22046792be18667a2ca0aa404e315d43c

[flang][nfc] Fix comments, remove needless API, tweak script

* Remove an unimplemented and unused member function declaration
* Remove a misleading comment about an unrelated constraint number
* Fix a comment
* Add f18 crash message to "flang" driver script

Differential Revision: https://reviews.llvm.org/D95180

GitOrigin-RevId: f187d64c80acd84f3f60799b80eba2485f8866df

include/flang/Parser/provenance.h

diff --git a/include/flang/Parser/provenance.h b/include/flang/Parser/provenance.h
index 1f0a0a9..73661d9 100644
--- a/include/flang/Parser/provenance.h
+++ b/include/flang/Parser/provenance.h
@@ -173,7 +173,6 @@
   std::string GetPath(Provenance) const; // __FILE__
   int GetLineNumber(Provenance) const; // __LINE__
   Provenance CompilerInsertionProvenance(char ch);
-  Provenance CompilerInsertionProvenance(const char *, std::size_t);
   ProvenanceRange IntersectionWithSourceFiles(ProvenanceRange) const;
   llvm::raw_ostream &Dump(llvm::raw_ostream &) const;
 

include/flang/Semantics/symbol.h

diff --git a/include/flang/Semantics/symbol.h b/include/flang/Semantics/symbol.h
index dc7196c..f04b05a 100644
--- a/include/flang/Semantics/symbol.h
+++ b/include/flang/Semantics/symbol.h
@@ -356,7 +356,7 @@
 };
 
 // Record the USE of a symbol: location is where (USE statement or renaming);
-// symbol is the USEd module.
+// symbol is in the USEd module.
 class UseDetails {
 public:
   UseDetails(const SourceName &location, const Symbol &symbol)

lib/Semantics/assignment.cpp

diff --git a/lib/Semantics/assignment.cpp b/lib/Semantics/assignment.cpp
index 090aae0..1fae92c 100644
--- a/lib/Semantics/assignment.cpp
+++ b/lib/Semantics/assignment.cpp
@@ -70,7 +70,7 @@
       const Scope &scope{context_.FindScope(lhsLoc)};
       if (auto whyNot{WhyNotModifiable(lhsLoc, lhs, scope, true)}) {
         if (auto *msg{Say(lhsLoc,
-                "Left-hand side of assignment is not modifiable"_err_en_US)}) { // C1158
+                "Left-hand side of assignment is not modifiable"_err_en_US)}) {
           msg->Attach(*whyNot);
         }
       }

tools/f18/flang

diff --git a/tools/f18/flang b/tools/f18/flang
index 01bdffd..7109cd7 100644
--- a/tools/f18/flang
+++ b/tools/f18/flang
@@ -12,4 +12,9 @@
 if [[ ! -d $module_dir ]]; then
   module_dir=$wd/tools/flang/include/flang
 fi
-$wd/bin/f18 -module-suffix .f18.mod -intrinsic-module-directory $module_dir "$@"
+opts="-module-suffix .f18.mod -intrinsic-module-directory $module_dir"
+if ! $wd/bin/f18 $opts "$@"
+then status=$?
+     echo flang: in $PWD, f18 failed with exit status $status: $wd/bin/f18 $opts "$@" >&2
+     exit $status
+fi