From d85be0cc60b067bc8ee594c63ddf1318cfbd8f3d Mon Sep 17 00:00:00 2001 From: Sebastian Redl Date: Wed, 3 Feb 2010 02:08:48 +0000 Subject: Don't do an expensive definition check where a cheap 'is this C?' check suffices. llvm-svn: 95188 --- clang/lib/Sema/SemaDecl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'clang/lib/Sema/SemaDecl.cpp') diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index d203376f91b..80831f42c8c 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -1300,7 +1300,8 @@ void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous) { // C++ doesn't have tentative definitions, so go right ahead and check here. const VarDecl *Def; - if (New->isThisDeclarationADefinition() == VarDecl::Definition && + if (getLangOptions().CPlusPlus && + New->isThisDeclarationADefinition() == VarDecl::Definition && (Def = Old->getDefinition())) { Diag(New->getLocation(), diag::err_redefinition) << New->getDeclName(); -- cgit v1.2.3