staging

Author: perry-ca

clang/include/clang/Sema/Sema.h

@@ -2309,6 +2309,9 @@ class Sema final : public SemaBase {
   ActOnPragmaMSFunction(SourceLocation Loc,
                         const llvm::SmallVectorImpl<StringRef> &NoBuiltins);
 
+  NamedDecl *lookupExternCName(IdentifierInfo *IdentId, SourceLocation NameLoc,
+                               Scope *curScope);
+
   /// A label from a C++ #pragma export, for a symbol that we
   /// haven't seen the declaration for yet.
   struct SymbolLabel {
@@ -2319,7 +2322,8 @@ class Sema final : public SemaBase {
   llvm::DenseMap<IdentifierInfo *, SymbolLabel> PendingExportedNames;
 
   /// ActonPragmaExport - called on well-formed '\#pragma export'.
-  void ActOnPragmaExport(IdentifierInfo *IdentId, SourceLocation ExportNameLoc);
+  void ActOnPragmaExport(IdentifierInfo *IdentId, SourceLocation ExportNameLoc,
+                         Scope *curScope);
 
   /// Only called on function definitions; if there is a pragma in scope
   /// with the effect of a range-based optnone, consider marking the function

clang/lib/Parse/ParsePragma.cpp

@@ -1422,7 +1422,6 @@ bool Parser::zOSHandlePragmaHelper(tok::TokenKind PragmaKind) {
       return false;
     }
 
-    // C++ could have a nested name, or be qualified with ::.
     PP.Lex(Tok);
     if (Tok.isNot(tok::identifier)) {
       PP.Diag(Tok.getLocation(), diag::warn_pragma_expected_identifier)
@@ -1441,7 +1440,7 @@ bool Parser::zOSHandlePragmaHelper(tok::TokenKind PragmaKind) {
     }
 
     PP.Lex(Tok);
-    Actions.ActOnPragmaExport(IdentName, IdentNameLoc);
+    Actions.ActOnPragmaExport(IdentName, IdentNameLoc, getCurScope());
 
     // Because export is also a C++ keyword, we also check for that.
     if (Tok.is(tok::identifier) || Tok.is(tok::kw_export)) {

clang/lib/Sema/SemaAttr.cpp

@@ -1327,23 +1327,35 @@ void Sema::AddImplicitMSFunctionNoBuiltinAttr(FunctionDecl *FD) {
     FD->addAttr(NoBuiltinAttr::CreateImplicit(Context, V.data(), V.size()));
 }
 
-void Sema::ActOnPragmaExport(IdentifierInfo *IdentId, SourceLocation NameLoc) {
+NamedDecl *Sema::lookupExternCName(IdentifierInfo *IdentId,
+                                   SourceLocation NameLoc, Scope *curScope) {
+  LookupResult Result(*this, IdentId, NameLoc, LookupOrdinaryName);
+  LookupName(Result, curScope);
+  if (!getLangOpts().CPlusPlus)
+    return Result.getAsSingle<NamedDecl>();
+  for (LookupResult::iterator I = Result.begin(); I != Result.end(); ++I) {
+    NamedDecl *D = (*I)->getUnderlyingDecl();
+    if (auto *FD = dyn_cast<FunctionDecl>(D->getCanonicalDecl()))
+      if (FD->isExternC())
+        return D;
+    if (isa<VarDecl>(D->getCanonicalDecl()))
+      return D;
+  }
+  return nullptr;
+}
+
+void Sema::ActOnPragmaExport(IdentifierInfo *IdentId, SourceLocation NameLoc, Scope *curScope) {
   SymbolLabel Label;
   Label.NameLoc = NameLoc;
   Label.Used = false;
 
-  NamedDecl *PrevDecl =
-      LookupSingleName(TUScope, IdentId, NameLoc, LookupOrdinaryName);
+  NamedDecl *PrevDecl = lookupExternCName(IdentId, NameLoc, curScope);
   if (!PrevDecl) {
     PendingExportedNames[IdentId] = Label;
     return;
   }
 
   if (auto *FD = dyn_cast<FunctionDecl>(PrevDecl->getCanonicalDecl())) {
-    if (getLangOpts().CPlusPlus && !FD->isExternC()) {
-      PendingExportedNames[IdentId] = Label;
-      return;
-    }
     if (!FD->hasExternalFormalLinkage()) {
       Diag(NameLoc, diag::warn_pragma_not_applied) << "export" << PrevDecl;
       return;