C does not have inline variables

[probinson]

Summary

We have a C test that now gets a warning about a C++1z extension, which seems inappropriate.

[probinson]

Ping.

[aaron.ballman]

LGTM! I don't think we intended this to be an extension for C.

[majnemer]

lib/Sema/SemaDecl.cpp

6189–6191

I'd suggest sorting this condition higher. It doesn't make much sense to mention block scopes when inline variables are prohibited in all contexts in C.

[probinson]

lib/Sema/SemaDecl.cpp

6189–6191

Right... for some reason the word 'block' in the comment made me think it was an Objective-C thing. The C-language check is first now.

[probinson]

Reorder the checks. I didn't see any tests for the adjacent (C++) diagnostics so I added some.

[rsmith]

Thanks!

lib/Sema/SemaDecl.cpp

if (D.getDeclSpec().isConceptSpecified()) {
           !NewVD->isInvalidDecl()) {
         Diag(D.getIdentifierLoc(), diag::err_variable_concept_bool_decl);
         NewVD->setInvalidDecl(true);
       }
     }
   }
 
   if (D.getDeclSpec().isInlineSpecified()) {
-    if (CurContext->isFunctionOrMethod()) {
+    if (!getLangOpts().CPlusPlus) {
+      Diag(D.getDeclSpec().getInlineSpecLoc(), diag::err_inline_non_function)
+          << 0;
+    } else if (CurContext->isFunctionOrMethod()) {
       // 'inline' is not allowed on block scope variable declaration.
       Diag(D.getDeclSpec().getInlineSpecLoc(),
            diag::err_inline_declaration_block_scope) << Name
         << FixItHint::CreateRemoval(D.getDeclSpec().getInlineSpecLoc());
     } else {
       Diag(D.getDeclSpec().getInlineSpecLoc(),
            getLangOpts().CPlusPlus1z ? diag::warn_cxx14_compat_inline_variable
                                      : diag::ext_inline_variable);
       NewVD->setInlineSpecified();
     }
   }
 
   // Set the lexical context. If the declarator has a C++ scope specifier, the
   // lexical context will be different from the semantic context.
   NewVD->setLexicalDeclContext(CurContext);

test/Sema/inline.c

 // -------
 // This is the main source file.
 // -------
 
 #define INCLUDE
 #include "inline.c"
 
 // Check that we don't allow illegal uses of inline
-inline int a; // expected-warning{{inline variables are a C++1z extension}}
+inline int a; // expected-error{{'inline' can only appear on functions}}
 typedef inline int b; // expected-error{{'inline' can only appear on functions}}
 int d(inline int a); // expected-error{{'inline' can only appear on functions}}
 
 // Check that the warnings from the "header file" aren't on by default in
 // the main source file.
 
 inline int useStaticMainFile () {
   staticFunction(); // no-warning

test/SemaCXX/inline.cpp

 // RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++14 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++1z %s -Wc++98-c++11-c++14-compat
 
 // Check that we don't allow illegal uses of inline
 // (checking C++-only constructs here)
 struct c {inline int a;}; // expected-error{{'inline' can only appear on functions}}
+
+void localVar() {
+  inline int a; // expected-error{{inline declaration of 'a' not allowed in block scope}}
+}
+
+// Check that we warn appropriately.
+#if __cplusplus <= 201402L
+inline int a; // expected-warning{{inline variables are a C++1z extension}}
+#else
+inline int a; // expected-warning{{inline variables are incompatible with C++ standards before C++1z}}
+#endif