[PATCH] D86357: [flang] Fix assert on bad character kind

[Tim Keith via Phabricator via llvm-commits]

tskeith created this revision.
tskeith added reviewers: klausler, PeteSteinfeld, sscalpone.
tskeith added a project: Flang.
Herald added a reviewer: jdoerfert.
Herald added a reviewer: DavidTruby.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
tskeith requested review of this revision.

When we report an error for a bad character kind, don't keep it in the
`DeclTypeSpec`. Otherwise there could be further problems. In this case,
`ComputeOffsets()` got an assertion error because we didn't recognize
`CHARACTER(*,8)` as needing a descriptor because of the bad kind.

Fixes https://bugs.llvm.org/show_bug.cgi?id=47173


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D86357

Files:
  flang/lib/Semantics/resolve-names.cpp
  flang/test/Semantics/kinds02.f90


Index: flang/test/Semantics/kinds02.f90
===================================================================
--- flang/test/Semantics/kinds02.f90
+++ flang/test/Semantics/kinds02.f90
@@ -83,3 +83,9 @@
 !ERROR: CHARACTER(KIND=8) is not a supported type
 character(len=*), parameter :: cvar11 = 8_"abcd"
 end program
+
+subroutine s(a, b)
+  character(*,2) :: a
+  !ERROR: KIND value (8) not valid for CHARACTER
+  character(*,8) :: b
+end
Index: flang/lib/Semantics/resolve-names.cpp
===================================================================
--- flang/lib/Semantics/resolve-names.cpp
+++ flang/lib/Semantics/resolve-names.cpp
@@ -3461,6 +3461,7 @@
           TypeCategory::Character, *intKind)) { // C715, C719
     Say(currStmtSource().value(),
         "KIND value (%jd) not valid for CHARACTER"_err_en_US, *intKind);
+    charInfo_.kind = std::nullopt; // prevent further errors
   }
   if (x.length) {
     charInfo_.length = GetParamValue(*x.length, common::TypeParamAttr::Len);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86357.287059.patch
Type: text/x-patch
Size: 992 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200821/990e5158/attachment.bin>