diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-02-03 02:08:48 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-02-03 02:08:48 +0000 |
| commit | 6c048a916f6bf526c12217f4a2bc3aa1a62bd62e (patch) | |
| tree | 9accb4a1a8fcef566bab55de1d8f7c3fb9389b42 | |
| parent | 16acfee729e00536af827935ccfcf69be721e462 (diff) | |
Don't do an expensive definition check where a cheap 'is this C?' check suffices.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95188 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index d203376f91..80831f42c8 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/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(); |