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

Fix various bugs in recent commits for C++ PCH. 

llvm-svn: 106995
This commit is contained in:
Argyrios Kyrtzidis 2010-06-28 09:31:34 +00:00
parent 2d69ec7a72
commit 0b0369a6b3
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/AST/DeclTemplate.cpp
View File

@ -393,7 +393,8 @@ TemplateArgumentList::TemplateArgumentList(ASTContext &Context,
TemplateArgumentList::TemplateArgumentList(ASTContext &Context,
const TemplateArgument *Args,
unsigned NumArgs) {
unsigned NumArgs)
: NumFlatArguments(0), NumStructuredArguments(0) {
init(Context, Args, NumArgs);
}

7
clang/lib/Frontend/PCHReader.cpp
View File

@ -3012,8 +3012,11 @@ PCHReader::ReadTemplateArgument(const RecordData &Record, unsigned &Idx) {
return TemplateArgument(GetType(Record[Idx++]));
case TemplateArgument::Declaration:
return TemplateArgument(GetDecl(Record[Idx++]));
case TemplateArgument::Integral:
return TemplateArgument(ReadAPSInt(Record, Idx), GetType(Record[Idx++]));
case TemplateArgument::Integral: {
llvm::APSInt Value = ReadAPSInt(Record, Idx);
QualType T = GetType(Record[Idx++]);
return TemplateArgument(Value, T);
}
case TemplateArgument::Template:
return TemplateArgument(ReadTemplateName(Record, Idx));
case TemplateArgument::Expression:

4
clang/lib/Frontend/PCHReaderDecl.cpp
View File

@ -216,6 +216,8 @@ void PCHDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
FD->setLocEnd(SourceLocation::getFromRawEncoding(Record[Idx++]));
switch ((FunctionDecl::TemplatedKind)Record[Idx++]) {
default: assert(false && "Unhandled TemplatedKind!");
break;
case FunctionDecl::TK_NonTemplate:
break;
case FunctionDecl::TK_FunctionTemplate:
@ -257,6 +259,7 @@ void PCHDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
NumTemplateArgLocs,
NumTemplateArgLocs ? TemplArgLocs.data() : 0,
LAngleLoc, RAngleLoc);
break;
}
case FunctionDecl::TK_DependentFunctionTemplateSpecialization: {
// Templates.
@ -273,6 +276,7 @@ void PCHDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
FD->setDependentTemplateSpecialization(*Reader.getContext(),
TemplDecls, TemplArgs);
break;
}
}

2
clang/lib/Frontend/PCHWriterDecl.cpp
View File

@ -225,6 +225,8 @@ void PCHDeclWriter::VisitFunctionDecl(FunctionDecl *D) {
Record.push_back(D->getTemplatedKind());
switch (D->getTemplatedKind()) {
default: assert(false && "Unhandled TemplatedKind!");
break;
case FunctionDecl::TK_NonTemplate:
break;
case FunctionDecl::TK_FunctionTemplate:

1
clang/test/PCH/cxx-templates.h
View File

@ -17,6 +17,7 @@ struct S<int, float> {
template <typename T, int y>
T templ_f(T x) {
int z = templ_f<int, 5>(3);
return x+y;
}