address comments

Author: perry-ca

clang/include/clang/Basic/AttrDocs.td

@@ -7505,18 +7505,18 @@ attribute requires a string literal argument to identify the handle being releas
 def zOSExportDocs : Documentation {
   let Category = DocCatFunction;
   let Content = [{
-Use the _Export keyword with a function name or external variable to declare
+Use the ``_Export`` keyword on a function or external variable to declare
 that it is to be exported (made available to other modules). You must define
-the object name in the same translation unit in which you use the _Export
+the object name in the same translation unit in which you use the ``_Export``
 keyword. For example:
 
 .. code-block:: c
 
   int _Export anthony(float);
 
-This statement exports the function anthony, if you define the function in the
-translation unit. The _Export keyword must immediately precede the object name.
-If you apply the _Export keyword to a class, the compiler automatically exports
+This statement exports the function ``anthony``, if you define the function in the
+translation unit. The ``_Export`` keyword must immediately precede the declaration name.
+If you apply the ``_Export`` keyword to a class, the compiler automatically exports
 all static data members and member functions of the class. However, if you want
 it to apply to individual class members, then you must apply it to each member
 that can be referenced.

clang/include/clang/Parse/Parser.h

@@ -857,7 +857,7 @@ class Parser : public CodeCompletionHandler {
 
   /// Helper functions for handling zOS pragmas.
   NestedNameSpecifier *zOSParseIdentifier(StringRef PragmaName,
-                                          IdentifierInfo *IdentName);
+                                          const IdentifierInfo *IdentName);
   bool zOSParseParameterList(StringRef PragmaName,
                              std::optional<SmallVector<QualType, 4>> &TypeList,
                              Qualifiers &CVQual);

clang/include/clang/Sema/DeclSpec.h

@@ -399,7 +399,7 @@ class DeclSpec {
   LLVM_PREFERRED_TYPE(bool)
   unsigned FS_noreturn_specified : 1;
   LLVM_PREFERRED_TYPE(bool)
-  unsigned export_specified : 1;
+  unsigned ExportSpecified : 1; // z/OS extension
 
   // friend-specifier
   LLVM_PREFERRED_TYPE(bool)
@@ -446,7 +446,7 @@ class DeclSpec {
   SourceLocation FS_forceinlineLoc;
   SourceLocation FriendLoc, ModulePrivateLoc, ConstexprLoc;
   SourceLocation TQ_pipeLoc;
-  SourceLocation exportLoc;
+  SourceLocation ExportLoc;
 
   WrittenBuiltinSpecs writtenBS;
   void SaveWrittenBuiltinSpecs();
@@ -495,7 +495,7 @@ class DeclSpec {
         TypeSpecPipe(false), TypeSpecSat(false), ConstrainedAuto(false),
         TypeQualifiers(TQ_unspecified), FS_inline_specified(false),
         FS_forceinline_specified(false), FS_virtual_specified(false),
-        FS_noreturn_specified(false), export_specified(false),
+        FS_noreturn_specified(false), ExportSpecified(false),
         FriendSpecifiedFirst(false), ConstexprSpecifier(static_cast<unsigned>(
                                          ConstexprSpecKind::Unspecified)),
         Attrs(attrFactory), writtenBS(), ObjCQualifiers(nullptr) {}
@@ -664,8 +664,8 @@ class DeclSpec {
   bool isNoreturnSpecified() const { return FS_noreturn_specified; }
   SourceLocation getNoreturnSpecLoc() const { return FS_noreturnLoc; }
 
-  bool isExportSpecified() const { return export_specified; }
-  SourceLocation getExportSpecLoc() const { return exportLoc; }
+  bool isExportSpecified() const { return ExportSpecified; }
+  SourceLocation getExportSpecLoc() const { return ExportLoc; }
 
   void ClearFunctionSpecs() {
     FS_inline_specified = false;
@@ -1964,9 +1964,9 @@ class Declarator {
   LLVM_PREFERRED_TYPE(bool)
   unsigned InlineStorageUsed : 1;
 
-  /// Indicates whether this is set as _Export
+  /// Indicates whether this is set as _Export.
   LLVM_PREFERRED_TYPE(bool)
-  unsigned ExportSpecified : 1;
+  unsigned ExportSpecified : 1; // z/OS extension
 
   /// Indicates whether this declarator has an initializer.
   LLVM_PREFERRED_TYPE(bool)
@@ -2014,7 +2014,7 @@ class Declarator {
   /// this declarator as a parameter pack.
   SourceLocation EllipsisLoc;
 
-  /// The source location of the _Export keyword on this declarator
+  /// The source location of the _Export keyword on this declarator.
   SourceLocation ExportLoc;
 
   Expr *PackIndexingExpr;
@@ -2126,13 +2126,13 @@ class Declarator {
       Range.setEnd(SR.getEnd());
   }
 
-  /// Set this declarator as _Export
+  /// Set this declarator as _Export.
   void SetExport(SourceLocation Loc) {
     ExportSpecified = true;
     ExportLoc = Loc;
   }
 
-  /// Whether this declarator is marked as _Export
+  /// Whether this declarator is marked as _Export.
   bool IsExport() const { return ExportSpecified; }
 
   /// Get the location of the _Export keyword
@@ -2157,6 +2157,7 @@ class Declarator {
     ExportSpecified = false;
     CommaLoc = SourceLocation();
     EllipsisLoc = SourceLocation();
+    ExportLoc = SourceLocation();
     PackIndexingExpr = nullptr;
   }
 

clang/lib/Parse/ParseDecl.cpp

@@ -4457,8 +4457,7 @@ void Parser::ParseDeclarationSpecifiers(
       break;
 
     case tok::kw__Export:
-      // If we find kw__Export, it is being applied to a var or function
-      // This will be handled in ParseDeclaratorInternal()
+      // We're done with the declaration-specifiers.
       goto DoneWithDeclSpec;
       break;
 
@@ -6187,7 +6186,9 @@ bool Parser::isDeclarationSpecifier(
   case tok::kw_virtual:
   case tok::kw_explicit:
   case tok::kw__Noreturn:
+#if SDP // need this in declspec?
   case tok::kw__Export:
+#endif
 
     // alignment-specifier
   case tok::kw__Alignas:

clang/lib/Parse/ParsePragma.cpp

@@ -1417,8 +1417,9 @@ bool Parser::HandlePragmaMSAllocText(StringRef PragmaName,
   return true;
 }
 
-NestedNameSpecifier *Parser::zOSParseIdentifier(StringRef PragmaName,
-                                                IdentifierInfo *IdentName) {
+NestedNameSpecifier *
+Parser::zOSParseIdentifier(StringRef PragmaName,
+                           const IdentifierInfo *IdentName) {
   NestedNameSpecifier *NestedId = nullptr;
   if (Tok.is(tok::coloncolon)) {
     NestedId = NestedNameSpecifier::Create(Actions.Context, IdentName);
@@ -1435,14 +1436,13 @@ NestedNameSpecifier *Parser::zOSParseIdentifier(StringRef PragmaName,
   }
   while (Tok.is(tok::coloncolon)) {
     PP.Lex(Tok);
-    IdentName = Tok.getIdentifierInfo();
+    IdentifierInfo *II = Tok.getIdentifierInfo();
     if (Tok.isNot(tok::identifier)) {
       PP.Diag(Tok.getLocation(), diag::warn_pragma_expected_identifier)
           << PragmaName;
       return nullptr;
     }
-    NestedId =
-        NestedNameSpecifier::Create(Actions.Context, NestedId, IdentName);
+    NestedId = NestedNameSpecifier::Create(Actions.Context, NestedId, II);
     PP.Lex(Tok);
   }
   return NestedId;
@@ -1455,12 +1455,14 @@ bool Parser::zOSParseParameterList(
     TypeList = SmallVector<QualType, 4>();
     PP.Lex(Tok);
     while (Tok.isNot(tok::eof) && !Tok.is(tok::r_paren)) {
-      //SourceRange MatchingCTypeRange;
       TypeResult TResult = ParseTypeName(nullptr, DeclaratorContext::Prototype);
       if (!TResult.isInvalid()) {
         QualType QT = TResult.get().get();
-        if (!QT.getTypePtr()->isVoidType())
+        if (!QT.getTypePtr()->isVoidType()) {
+          fprintf(stderr, "SDP: paramType -\n");
+          QT.getCanonicalType()->dump();
           TypeList->push_back(QT);
+        }
       }
       if (Tok.is(tok::comma) || Tok.is(tok::identifier))
         PP.Lex(Tok);

clang/lib/Parse/ParseStmt.cpp

@@ -538,6 +538,11 @@ StmtResult Parser::ParseStatementOrDeclarationAfterAttributes(
   case tok::annot_pragma_attribute:
     HandlePragmaAttribute();
     return StmtEmpty();
+  case tok::annot_pragma_export:
+    ProhibitAttributes(CXX11Attrs);
+    ProhibitAttributes(GNUAttrs);
+    HandlePragmaExport();
+    return StmtEmpty();
   }
 
   // If we reached this code, the statement must end in a semicolon.
@@ -1122,6 +1127,9 @@ void Parser::ParseCompoundStatementLeadingPragmas() {
     case tok::annot_pragma_dump:
       HandlePragmaDump();
       break;
+    case tok::annot_pragma_export:
+      HandlePragmaExport();
+      break;
     default:
       checkForPragmas = false;
       break;

clang/lib/Sema/DeclSpec.cpp

@@ -1105,8 +1105,8 @@ bool DeclSpec::setFunctionSpecNoreturn(SourceLocation Loc,
 }
 
 bool DeclSpec::setExportSpec(SourceLocation Loc) {
-  export_specified = true;
-  exportLoc = Loc;
+  ExportSpecified = true;
+  ExportLoc = Loc;
   return false;
 }
 

clang/lib/Sema/SemaAttr.cpp

@@ -1334,29 +1334,25 @@ static bool typeListMatches(ASTContext& Context, FunctionDecl *FD,
   for (unsigned i = 0; i != FD->getNumParams(); ++i) {
     const ParmVarDecl *PVD = FD->getParamDecl(i);
     QualType ParmType = PVD->getType().getCanonicalType();
-    fprintf(stderr, "SDP: --- pramtype\n");
-    ParmType->dump();
+#if SDP
+    // SDP QualType ParmType = PVD->getOriginalType().getCanonicalType();
     if (ParmType->isArrayType())
       ParmType = Context.getArrayDecayedType(ParmType);
     else if (ParmType->isFunctionType())
-    { fprintf(stderr, "  - is function\n");
       ParmType = Context.getPointerType(ParmType);
-      }
-    ParmType->dump();
+#endif
 
     QualType MapArgType = (*Label.TypeList)[i].getCanonicalType();
-    fprintf(stderr, "SDP: --- MapArgtype\n");
-    MapArgType->dump();
+#if SDP
     if (MapArgType->isArrayType())
       MapArgType = Context.getArrayDecayedType(MapArgType);
     else if (MapArgType->isFunctionType())
-    { fprintf(stderr, "  - is function\n");
       MapArgType = Context.getPointerType(MapArgType);
-      }
     MapArgType.getDesugaredType(Context)->dump();
 
     assert(!ParmType->canDecayToPointerType());
     assert(!MapArgType->canDecayToPointerType());
+#endif
     if (ParmType != MapArgType)
       return false;
   }

clang/lib/Sema/SemaType.cpp

@@ -4250,7 +4250,6 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
   // The TypeSourceInfo that this function returns will not be a null type.
   // If there is an error, this function will fill in a dummy type as fallback.
   QualType T = declSpecType;
-  fprintf(stderr, "SDP: === GetFullTypeForDeclarator\n"); T->dump(); fprintf(stderr, "SDP: === GetFullTypeForDeclarator\n");
   Declarator &D = state.getDeclarator();
   Sema &S = state.getSema();
   ASTContext &Context = S.Context;
@@ -5723,7 +5722,6 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D) {
 
   TypeSourceInfo *ReturnTypeInfo = nullptr;
   QualType T = GetDeclSpecTypeForDeclarator(state, ReturnTypeInfo);
-  fprintf(stderr, "SDP: === GetTypeForDeclarator\n"); T->dump(); fprintf(stderr, "SDP: === GetTypeForDeclarator\n");
   if (D.isPrototypeContext() && getLangOpts().ObjCAutoRefCount)
     inferARCWriteback(state, T);