summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2010-01-30 17:42:34 +0000
committerAnders Carlsson <andersca@mac.com>2010-01-30 17:42:34 +0000
commitbd32c434ae33b5bb7e027c5b9aac7dec5f7b78f6 (patch)
treefcbdaf177f0073f007733c14e11f2c3d97336662 /clang
parent2ecf8eb2dccdfc002d886c6db19fcf38d177ccd2 (diff)
downloadbcm5719-llvm-bd32c434ae33b5bb7e027c5b9aac7dec5f7b78f6.tar.gz
bcm5719-llvm-bd32c434ae33b5bb7e027c5b9aac7dec5f7b78f6.zip
Add an assert to make sure that we don't try to mess with overridden methods for class templates.
llvm-svn: 94907
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/AST/DeclCXX.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index fe6064df325..73f47d9bc06 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/lib/AST/DeclCXX.cpp
@@ -604,7 +604,9 @@ static OverriddenMethodsMapTy *OverriddenMethods = 0;
void CXXMethodDecl::addOverriddenMethod(const CXXMethodDecl *MD) {
assert(MD->isCanonicalDecl() && "Method is not canonical!");
-
+ assert(!MD->getParent()->isDependentContext() &&
+ "Can't add an overridden method to a class template!");
+
// FIXME: The CXXMethodDecl dtor needs to remove and free the entry.
if (!OverriddenMethods)
OpenPOWER on IntegriCloud