replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

llvm-svn: 187770
This commit is contained in:
Larisse Voufo 2013-08-06 03:57:41 +00:00
parent 08d5085d43
commit 4154f46c5a
5 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/AST/DeclTemplate.h
View File

@ -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 *

14
clang/lib/Sema/SemaOverload.cpp
View File

@ -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;

1
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
View File

@ -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() &&

3
clang/test/Driver/crash-report.c
View File

@ -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

52
clang/test/SemaCXX/function-pointer-arguments.cpp
View File

@ -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')}}
}