diff options
| author | Kaelyn Uhrain <rikka@google.com> | 2012-02-15 22:59:03 +0000 |
|---|---|---|
| committer | Kaelyn Uhrain <rikka@google.com> | 2012-02-15 22:59:03 +0000 |
| commit | 618f97ca21d5319f499a2fe130e957aea2475051 (patch) | |
| tree | c16d75e484fa9906fac5dbcc7d51eda172543b83 /clang/lib/Sema/SemaLookup.cpp | |
| parent | a0009ee85aea460111104297aa951b44f5e95039 (diff) | |
| download | bcm5719-llvm-618f97ca21d5319f499a2fe130e957aea2475051.tar.gz bcm5719-llvm-618f97ca21d5319f499a2fe130e957aea2475051.zip | |
Silence a valgrind warning, and remove an unused var.
llvm-svn: 150629
Diffstat (limited to 'clang/lib/Sema/SemaLookup.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index ceb3dcaaed3..81710d2043f 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -3335,8 +3335,6 @@ void NamespaceSpecifierSet::AddNamespace(NamespaceDecl *ND) { unsigned NumSpecifiers = 0; DeclContextList NamespaceDeclChain(BuildContextChain(Ctx)); DeclContextList FullNamespaceDeclChain(NamespaceDeclChain); - // The full size of NamespaceDeclChain before any common elements are removed - DeclContextList::size_type FullSize = NamespaceDeclChain.size(); // Eliminate common elements from the two DeclContext chains. for (DeclContextList::reverse_iterator C = CurContextChain.rbegin(), @@ -3348,7 +3346,8 @@ void NamespaceSpecifierSet::AddNamespace(NamespaceDecl *ND) { // Add an explicit leading '::' specifier if needed. if (NamespaceDecl *ND = - dyn_cast<NamespaceDecl>(NamespaceDeclChain.back())) { + NamespaceDeclChain.empty() ? NULL : + dyn_cast_or_null<NamespaceDecl>(NamespaceDeclChain.back())) { IdentifierInfo *Name = ND->getIdentifier(); if (std::find(CurContextIdentifiers.begin(), CurContextIdentifiers.end(), Name) != CurContextIdentifiers.end() || |
