From 4e0ff9c46b13bc89b00c1e8d3886c7bdd792d3a0 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Thu, 14 Jul 2016 22:22:58 +0000 Subject: [PATCH] C does not have inline variables. Add a few missing tests for related C++ diagnostics. Differential Revision: http://reviews.llvm.org/D22113 llvm-svn: 275493 --- clang/lib/Sema/SemaDecl.cpp | 5 ++++- clang/test/Sema/inline.c | 2 +- clang/test/SemaCXX/inline.cpp | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index c0ccbbf..cedd214 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -6178,7 +6178,10 @@ Sema::ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC, } 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 diff --git a/clang/test/Sema/inline.c b/clang/test/Sema/inline.c index 33b2520..eced058 100644 --- a/clang/test/Sema/inline.c +++ b/clang/test/Sema/inline.c @@ -49,7 +49,7 @@ inline int useConst () { #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}} diff --git a/clang/test/SemaCXX/inline.cpp b/clang/test/SemaCXX/inline.cpp index e569300..b20bc18 100644 --- a/clang/test/SemaCXX/inline.cpp +++ b/clang/test/SemaCXX/inline.cpp @@ -1,5 +1,18 @@ // 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 -- 2.7.4