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

llvm-svn: 187770

5 files changed, 8 insertions, 64 deletions

diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h
index a0764054c7f..5d4ddc14aaf 100644
--- a/clang/include/clang/AST/DeclTemplate.h
+++ b/clang/include/clang/AST/DeclTemplate.h
@@ -2560,7 +2560,7 @@ class VarTemplatePartialSpecializationDecl
   VarTemplatePartialSpecializationDecl()
       : VarTemplateSpecializationDecl(VarTemplatePartialSpecialization),
         TemplateParams(0), ArgsAsWritten(0), NumArgsAsWritten(0),
-        SequenceNumber(SequenceNumber), InstantiatedFromMember(0, false) {}
+        SequenceNumber(0), InstantiatedFromMember(0, false) {}
 
 public:
   static VarTemplatePartialSpecializationDecl *
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() &&
diff --git a/clang/test/Driver/crash-report.c b/clang/test/Driver/crash-report.c
index 97dbeac7a63..afac9347142 100644
--- a/clang/test/Driver/crash-report.c
+++ b/clang/test/Driver/crash-report.c
@@ -14,6 +14,9 @@
 
 // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH=1 %clang -fsyntax-only -x c /dev/null 2>&1 | FileCheck %s
 
+// FIXME: Investigating. "fatal error: file 'nul' modified since it was first processed"
+// XFAIL: mingw32
+
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK-NEXT: note: diagnostic msg: {{.*}}.c
diff --git a/clang/test/SemaCXX/function-pointer-arguments.cpp b/clang/test/SemaCXX/function-pointer-arguments.cpp
deleted file mode 100644
index 9f3fb0a4ec2..00000000000
--- a/clang/test/SemaCXX/function-pointer-arguments.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//RUN: %clang_cc1 -fsyntax-only -verify %s
-
-namespace PR16570 {
-  int f1(int, int);
-  int f2(const int, int);
-  int f3(int&, int);
-  int f4(const int&, int);
-
-  void good() {
-    int(*g1)(int, int) = f1;
-    int(*g2)(const int, int) = f1;
-    int(*g3)(volatile int, int) = f1;
-    int(*g4)(int, int) = f2;
-    int(*g5)(const int, int) = f2;
-    int(*g6)(volatile int, int) = f2;
-    int(*g7)(int&, int) = f3;
-    int(*g8)(const int&, int) = f4;
-  }
-
-  void bad() {
-    void (*g1)(int, int) = f1;
-    // expected-error@-1 {{different return type ('void' vs 'int'}}
-    const int (*g2)(int, int) = f1;
-    // expected-error@-1 {{different return type ('const int' vs 'int')}}
-
-    int (*g3)(char, int) = f1;
-    // expected-error@-1 {{type mismatch at 1st parameter ('char' vs 'int')}}
-    int (*g4)(int, char) = f1;
-    // expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
-
-    int (*g5)(int) = f1;
-    // expected-error@-1 {{different number of parameters (1 vs 2)}}
-
-    int (*g6)(int, int, int) = f1;
-    // expected-error@-1 {{different number of parameters (3 vs 2)}}
-
-    int (*g7)(const int, char) = f1;
-    // expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
-    int (*g8)(int, char) = f2;
-    // expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
-    int (*g9)(const int&, char) = f3;
-    // expected-error@-1 {{type mismatch at 1st parameter ('const int &' vs 'int &')}}
-    int (*g10)(int&, char) = f4;
-    // expected-error@-1 {{type mismatch at 1st parameter ('int &' vs 'const int &')}}
-  }
-
-  typedef void (*F)(const char * __restrict__, int);
-  void g(const char *, unsigned);
-  F f = g;
-  // expected-error@-1 {{type mismatch at 2nd parameter ('int' vs 'unsigned int')}}
-
-}