commit 258a744bbd6dbfb675d3c39da021321f2b317dae
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 26 04:08:46 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 26 04:08:46 2012 +0000
tree 08bd61324793a416d0b0e8f04650ea5d8f96bc0c
parent eb75cc26af4ca8f5cba1b52f42809329ba48c583

Delay checking of dependent underlying types for redeclarations of member
enumerations in templates until the template is instantiated.

llvm-svn: 153426

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 68b27ef..e92b3e4 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -7780,7 +7780,9 @@
   }
 
   if (IsFixed && Prev->isFixed()) {
-    if (!Context.hasSameUnqualifiedType(EnumUnderlyingTy,
+    if (!EnumUnderlyingTy->isDependentType() &&
+        !Prev->getIntegerType()->isDependentType() &&
+        !Context.hasSameUnqualifiedType(EnumUnderlyingTy,
                                         Prev->getIntegerType())) {
       Diag(EnumLoc, diag::err_enum_redeclare_type_mismatch)
         << EnumUnderlyingTy << Prev->getIntegerType();