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 | d85be0cc60b067bc8ee594c63ddf1318cfbd8f3d (patch) | |
| tree | 122c7ab34fc31315344cdfaef80f5b0d390d320e /clang/lib/Sema/SemaDecl.cpp | |
| parent | 0b78cc2af59286f38cb2297bc2d54cbc2a8e4d9c (diff) | |
| download | bcm5719-llvm-d85be0cc60b067bc8ee594c63ddf1318cfbd8f3d.tar.gz bcm5719-llvm-d85be0cc60b067bc8ee594c63ddf1318cfbd8f3d.zip | |
Don't do an expensive definition check where a cheap 'is this C?' check suffices.
llvm-svn: 95188
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |
