Fixing commit r187768: Moved diagnosis of forward declarations of variable templates from Parser to Sema.

llvm-svn: 187770

2 files changed, 4 insertions, 11 deletions

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index fae4d023215..1a9b82962ba 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -2584,17 +2584,9 @@ bool Sema::FunctionArgTypesAreEqual(const FunctionProtoType *OldType,
   for (FunctionProtoType::arg_type_iterator O = OldType->arg_type_begin(),
        N = NewType->arg_type_begin(),
        E = OldType->arg_type_end(); O && (O != E); ++O, ++N) {
-    if (!(*O)->isReferenceType() && !(*N)->isReferenceType()) {
-      if (!Context.hasSameType(O->getUnqualifiedType(),
-                               N->getUnqualifiedType())) {
-        if (ArgPos) *ArgPos = O - OldType->arg_type_begin();
-        return false;
-      }
-    } else {
-      if (!Context.hasSameType(*O, *N)) {
-        if (ArgPos) *ArgPos = O - OldType->arg_type_begin();
-        return false;
-      }
+    if (!Context.hasSameType(*O, *N)) {
+      if (ArgPos) *ArgPos = O - OldType->arg_type_begin();
+      return false;
     }
   }
   return true;
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index b93fe9a966a..0ca6611c358 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3461,6 +3461,7 @@ void Sema::InstantiateVariableDefinition(SourceLocation PointOfInstantiation,
                VarSpec->getTemplateArgsInfo(), InstantiationDependent) &&
            "Only instantiate variable template specializations that are "
            "not type-dependent");
+    (void)InstantiationDependent;
 
     // Find the variable initialization that we'll be substituting.
     assert(VarSpec->getSpecializedTemplate() &&