[cfe-commits] r83492 - /cfe/trunk/lib/Sema/SemaLookup.cpp

[John McCall]

Author: rjmccall
Date: Wed Oct  7 17:04:40 2009
New Revision: 83492

URL: http://llvm.org/viewvc/llvm-project?rev=83492&view=rev
Log:
Dead code elimination.


Modified:
    cfe/trunk/lib/Sema/SemaLookup.cpp

Modified: cfe/trunk/lib/Sema/SemaLookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=83492&r1=83491&r2=83492&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Wed Oct  7 17:04:40 2009
@@ -660,7 +660,6 @@
   }
 
   Scope *Initial = S;
-  DeclContext *OutOfLineCtx = 0;
   IdentifierResolver::iterator
     I = IdResolver.begin(Name),
     IEnd = IdResolver.end();
@@ -742,26 +741,7 @@
   // context as well as walking through the scopes.
 
   LookupResultsTy LookupResults;
-  assert((!OutOfLineCtx || OutOfLineCtx->isFileContext()) &&
-         "We should have been looking only at file context here already.");
   bool LookedInCtx = false;
-  LookupResult Result;
-  while (OutOfLineCtx &&
-         OutOfLineCtx != S->getEntity() &&
-         OutOfLineCtx->isNamespace()) {
-    LookedInCtx = true;
-
-    // Look into context considering using-directives.
-    CppNamespaceLookup(Context, OutOfLineCtx, Name, NameKind, IDNS,
-                       LookupResults, &UDirs);
-
-    if ((Result = MergeLookupResults(Context, LookupResults)) ||
-        (RedeclarationOnly && !OutOfLineCtx->isTransparentContext()))
-      return std::make_pair(true, Result);
-
-    OutOfLineCtx = OutOfLineCtx->getParent();
-  }
-
   for (; S; S = S->getParent()) {
     DeclContext *Ctx = static_cast<DeclContext *>(S->getEntity());
     if (Ctx->isTransparentContext())
@@ -797,6 +777,7 @@
     CppNamespaceLookup(Context, Ctx, Name, NameKind, IDNS,
                        LookupResults, &UDirs);
 
+    LookupResult Result;
     if ((Result = MergeLookupResults(Context, LookupResults)) ||
         (RedeclarationOnly && !Ctx->isTransparentContext()))
       return std::make_pair(true, Result);