From 2da6670ef0fd1e3d809b4ef821950d49c72c3c85 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Thu, 2 Dec 2010 16:19:31 +0000
Subject: [PATCH] Do not change the size of LookupResult::Filter based on the
 NDEBUG macri; the extra bool fits into padding anyway.

llvm-svn: 120708
---
 clang/include/clang/Sema/Lookup.h | 15 +--------------
 clang/lib/Sema/SemaLookup.cpp     |  2 --
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/clang/include/clang/Sema/Lookup.h b/clang/include/clang/Sema/Lookup.h
index 1badca21d23f..aa58d14fac73 100644
--- a/clang/include/clang/Sema/Lookup.h
+++ b/clang/include/clang/Sema/Lookup.h
@@ -497,25 +497,18 @@ public:
     LookupResult &Results;
     LookupResult::iterator I;
     bool Changed;
-#ifndef NDEBUG
     bool CalledDone;
-#endif
     
     friend class LookupResult;
     Filter(LookupResult &Results)
-      : Results(Results), I(Results.begin()), Changed(false)
-#ifndef NDEBUG
-      , CalledDone(false)
-#endif
+      : Results(Results), I(Results.begin()), Changed(false), CalledDone(false)
     {}
 
   public:
-#ifndef NDEBUG
     ~Filter() {
       assert(CalledDone &&
              "LookupResult::Filter destroyed without done() call");
     }
-#endif
 
     bool hasNext() const {
       return I != Results.end();
@@ -546,10 +539,8 @@ public:
     }
 
     void done() {
-#ifndef NDEBUG
       assert(!CalledDone && "done() called twice");
       CalledDone = true;
-#endif
 
       if (Changed)
         Results.resolveKindAfterFilter();
@@ -578,11 +569,7 @@ private:
   void configure();
 
   // Sanity checks.
-#ifndef NDEBUG
   void sanity() const;
-#else
-  void sanity() const {}
-#endif
 
   bool sanityCheckUnresolved() const {
     for (iterator I = begin(), E = end(); I != E; ++I)
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index b73177e791bd..16ca78f4dd2e 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -292,7 +292,6 @@ void LookupResult::configure() {
   }
 }
 
-#ifndef NDEBUG
 void LookupResult::sanity() const {
   assert(ResultKind != NotFound || Decls.size() == 0);
   assert(ResultKind != Found || Decls.size() == 1);
@@ -307,7 +306,6 @@ void LookupResult::sanity() const {
                              (Ambiguity == AmbiguousBaseSubobjectTypes ||
                               Ambiguity == AmbiguousBaseSubobjects)));
 }
-#endif
 
 // Necessary because CXXBasePaths is not complete in Sema.h
 void LookupResult::deletePaths(CXXBasePaths *Paths) {