characters are always array... the default length is 1

Author: Hal Finkel

lib/Parse/ParseDecl.cpp

@@ -13,6 +13,7 @@
 
 #include "lfort/Parse/Parser.h"
 #include "RAIIObjectsForParser.h"
+#include "lfort/AST/ASTContext.h"
 #include "lfort/Basic/AddressSpaces.h"
 #include "lfort/Basic/OpenCL.h"
 #include "lfort/Basic/TargetInfo.h"
@@ -3355,6 +3356,7 @@ void Parser::ParseDeclarationTypeSpec(DeclSpec &DS,
     break; }
   case tok::kw_character: {
     DeclSpec::TST T = DeclSpec::TST_char;
+    bool LenProvided = false;
     if (NextToken().isInLine(tok::l_paren) || NextToken().isInLine(tok::star)) {
       bool OldStyle = NextToken().isInLine(tok::star);
       unsigned KindValue;
@@ -3386,11 +3388,23 @@ void Parser::ParseDeclarationTypeSpec(DeclSpec &DS,
       }
 
       if (!LenValueLoc.isInvalid()) {
+        LenProvided = true;
         DeclaratorChunks.push_back(DeclaratorChunk::getArray(0, false, 0,
           LenValue.release(), LenValueLoc, LenValueLoc));
       }
     }
 
+    // The default length is 1.
+    if (!LenProvided) {
+      QualType SizeTy = Actions.getASTContext().getSizeType();
+      unsigned SizeSize = Actions.getASTContext().getTypeSize(SizeTy);
+      DeclaratorChunks.push_back(DeclaratorChunk::getArray(0, false, 0,
+        IntegerLiteral::Create(Actions.getASTContext(),
+                               llvm::APInt(SizeSize, 1),
+                               SizeTy, SourceLocation()),
+        Loc, Loc));
+    }
+
     isInvalid |= DS.SetTypeSpecType(T, Loc, PrevSpec, DiagID);
     break; }
     // FIXME: everything else

test/CodeGen/decl.F90

@@ -52,8 +52,8 @@ program hello
 ! CHECK: %i6 = alloca i64, align 8
 character c
 character(kind = 4) c2
-! CHECK: %c = alloca i8, align 1
-! CHECK: %c2 = alloca i32, align 4
+! CHECK: %c = alloca [1 x i8], align 1
+! CHECK: %c2 = alloca [1 x i32], align 4
 character*3 c3
 character*4, c4
 character*(2+3) c5