Types appearing more than once in a spec shouldn't matter.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83766 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExceptionSpec.cpp b/lib/Sema/SemaExceptionSpec.cpp
index 8720d81..4171ece 100644
--- a/lib/Sema/SemaExceptionSpec.cpp
+++ b/lib/Sema/SemaExceptionSpec.cpp
@@ -117,16 +117,21 @@
bool Success = true;
// Both have a definite exception spec. Collect the first set, then compare
// to the second.
- llvm::SmallPtrSet<const Type*, 8> Types;
+ llvm::SmallPtrSet<const Type*, 8> OldTypes, NewTypes;
for (FunctionProtoType::exception_iterator I = Old->exception_begin(),
E = Old->exception_end(); I != E; ++I)
- Types.insert(Context.getCanonicalType(*I).getTypePtr());
+ OldTypes.insert(Context.getCanonicalType(*I).getTypePtr());
for (FunctionProtoType::exception_iterator I = New->exception_begin(),
- E = New->exception_end(); I != E && Success; ++I)
- Success = Types.erase(Context.getCanonicalType(*I).getTypePtr());
+ E = New->exception_end(); I != E && Success; ++I) {
+ const Type *TypePtr = Context.getCanonicalType(*I).getTypePtr();
+ if(OldTypes.count(TypePtr))
+ NewTypes.insert(TypePtr);
+ else
+ Success = false;
+ }
- Success = Success && Types.empty();
+ Success = Success && OldTypes.size() == NewTypes.size();
if (Success) {
return false;
diff --git a/test/SemaCXX/exception-spec.cpp b/test/SemaCXX/exception-spec.cpp
index cf7089c..bd22bf3 100644
--- a/test/SemaCXX/exception-spec.cpp
+++ b/test/SemaCXX/exception-spec.cpp
@@ -62,6 +62,10 @@
void r8() throw(int);
void r8() throw(const int);
+// Multiple appearances don't matter.
+void r9() throw(int, int);
+void r9() throw(int, int);
+
struct A
{
};