[cfe-commits] r103342 - in /cfe/trunk/lib/Sema: SemaOverload.cpp SemaOverload.h

[Douglas Gregor]

Author: dgregor
Date: Sat May  8 13:20:53 2010
New Revision: 103342

URL: http://llvm.org/viewvc/llvm-project?rev=103342&view=rev
Log:
Minor cleanup, and ban copying of OverloadCandidateSets. No
functionality change. 

Modified:
    cfe/trunk/lib/Sema/SemaOverload.cpp
    cfe/trunk/lib/Sema/SemaOverload.h

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=103342&r1=103341&r2=103342&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Sat May  8 13:20:53 2010
@@ -296,13 +296,14 @@
   switch (TDK) {
   case Sema::TDK_Success:
   case Sema::TDK_InstantiationDepth:
+  case Sema::TDK_TooManyArguments:
+  case Sema::TDK_TooFewArguments:
     break;
       
   case Sema::TDK_Incomplete:
     Result.Data = Info.Param.getOpaqueValue();
     break;
       
-  // Unhandled
   case Sema::TDK_Inconsistent:
   case Sema::TDK_InconsistentQuals: {
     DFIParamWithArguments *Saved = new DFIParamWithArguments;
@@ -315,8 +316,6 @@
       
   case Sema::TDK_SubstitutionFailure:
   case Sema::TDK_NonDeducedMismatch:
-  case Sema::TDK_TooManyArguments:
-  case Sema::TDK_TooFewArguments:
   case Sema::TDK_InvalidExplicitArguments:
   case Sema::TDK_FailedOverloadResolution:
     break;  
@@ -330,19 +329,19 @@
   case Sema::TDK_Success:
   case Sema::TDK_InstantiationDepth:
   case Sema::TDK_Incomplete:
+  case Sema::TDK_TooManyArguments:
+  case Sema::TDK_TooFewArguments:
     break;
       
-  // Unhandled
   case Sema::TDK_Inconsistent:
   case Sema::TDK_InconsistentQuals:
     delete static_cast<DFIParamWithArguments*>(Data);
     Data = 0;
     break;
       
+  // Unhandled
   case Sema::TDK_SubstitutionFailure:
   case Sema::TDK_NonDeducedMismatch:
-  case Sema::TDK_TooManyArguments:
-  case Sema::TDK_TooFewArguments:
   case Sema::TDK_InvalidExplicitArguments:
   case Sema::TDK_FailedOverloadResolution:
     break;
@@ -354,6 +353,8 @@
   switch (static_cast<Sema::TemplateDeductionResult>(Result)) {
   case Sema::TDK_Success:
   case Sema::TDK_InstantiationDepth:
+  case Sema::TDK_TooManyArguments:
+  case Sema::TDK_TooFewArguments:
     return TemplateParameter();
     
   case Sema::TDK_Incomplete:
@@ -366,8 +367,6 @@
   // Unhandled
   case Sema::TDK_SubstitutionFailure:
   case Sema::TDK_NonDeducedMismatch:
-  case Sema::TDK_TooManyArguments:
-  case Sema::TDK_TooFewArguments:
   case Sema::TDK_InvalidExplicitArguments:
   case Sema::TDK_FailedOverloadResolution:
     break;
@@ -381,17 +380,17 @@
   case Sema::TDK_Success:
   case Sema::TDK_InstantiationDepth:
   case Sema::TDK_Incomplete:
+  case Sema::TDK_TooManyArguments:
+  case Sema::TDK_TooFewArguments:
     return 0;
 
-  // Unhandled
   case Sema::TDK_Inconsistent:
   case Sema::TDK_InconsistentQuals:
     return &static_cast<DFIParamWithArguments*>(Data)->FirstArg;      
 
+  // Unhandled
   case Sema::TDK_SubstitutionFailure:
   case Sema::TDK_NonDeducedMismatch:
-  case Sema::TDK_TooManyArguments:
-  case Sema::TDK_TooFewArguments:
   case Sema::TDK_InvalidExplicitArguments:
   case Sema::TDK_FailedOverloadResolution:
     break;
@@ -406,17 +405,17 @@
   case Sema::TDK_Success:
   case Sema::TDK_InstantiationDepth:
   case Sema::TDK_Incomplete:
+  case Sema::TDK_TooManyArguments:
+  case Sema::TDK_TooFewArguments:
     return 0;
 
-  // Unhandled
   case Sema::TDK_Inconsistent:
   case Sema::TDK_InconsistentQuals:
     return &static_cast<DFIParamWithArguments*>(Data)->SecondArg;
 
+  // Unhandled
   case Sema::TDK_SubstitutionFailure:
   case Sema::TDK_NonDeducedMismatch:
-  case Sema::TDK_TooManyArguments:
-  case Sema::TDK_TooFewArguments:
   case Sema::TDK_InvalidExplicitArguments:
   case Sema::TDK_FailedOverloadResolution:
     break;

Modified: cfe/trunk/lib/Sema/SemaOverload.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.h?rev=103342&r1=103341&r2=103342&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.h (original)
+++ cfe/trunk/lib/Sema/SemaOverload.h Sat May  8 13:20:53 2010
@@ -580,6 +580,10 @@
     llvm::SmallPtrSet<Decl *, 16> Functions;
 
     SourceLocation Loc;    
+    
+    OverloadCandidateSet(const OverloadCandidateSet &);
+    OverloadCandidateSet &operator=(const OverloadCandidateSet &);
+    
   public:
     OverloadCandidateSet(SourceLocation Loc) : Loc(Loc) {}