Commit 742e3215 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r322030: 

------------------------------------------------------------------------
r322030 | rsmith | 2018-01-08 13:46:42 -0800 (Mon, 08 Jan 2018) | 3 lines

PR35862: Suppress -Wmissing-variable-declarations warning on inline variables,
variable templates, and instantiations thereof.

------------------------------------------------------------------------

llvm-svn: 333623
parent fa5423e8

clang/lib/Sema/SemaDecl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -10947,6 +10947,8 @@ void Sema::CheckCompleteVariableDeclaration(VarDecl *var) { 
  if (var->isThisDeclarationADefinition() &&

      var->getDeclContext()->getRedeclContext()->isFileContext() &&

      var->isExternallyVisible() && var->hasLinkage() &&

      !var->isInline() && !var->getDescribedVarTemplate() &&

      !isTemplateInstantiation(var->getTemplateSpecializationKind()) &&

      !getDiagnostics().isIgnored(diag::warn_missing_variable_declarations,

                                  var->getLocation())) {

    // Find a previous declaration that's not a definition.

clang/test/SemaCXX/warn-missing-variable-declarations.cpp

+22 −1
Original line number Diff line number Diff line 
// RUN: %clang -Wmissing-variable-declarations -fsyntax-only -Xclang -verify %s

// RUN: %clang -Wmissing-variable-declarations -fsyntax-only -Xclang -verify -std=c++17 %s



// Variable declarations that should trigger a warning.

int vbad1; // expected-warning{{no previous extern declaration for non-static variable 'vbad1'}}
@@ -52,3 +52,24 @@ class C { 
namespace {

  int vgood4;

}



inline int inline_var = 0;

const int const_var = 0;

constexpr int constexpr_var = 0;

inline constexpr int inline_constexpr_var = 0;

extern const int extern_const_var = 0; // expected-warning {{no previous extern declaration}}

extern constexpr int extern_constexpr_var = 0; // expected-warning {{no previous extern declaration}}



template<typename> int var_template = 0;

template<typename> constexpr int const_var_template = 0;

template<typename> static int static_var_template = 0;



template int var_template<int[1]>;

int use_var_template() { return var_template<int[2]>; }

template int var_template<int[3]>;

extern template int var_template<int[4]>;

template<> int var_template<int[5]>; // expected-warning {{no previous extern declaration}}



// FIXME: We give this specialization internal linkage rather than inheriting

// the linkage from the template! We should not warn here.

template<> int static_var_template<int[5]>; // expected-warning {{no previous extern declaration}}