From 652d82a096996d5ee7665b2905742e1a23364862 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Sat, 18 Apr 2009 05:55:16 +0000 Subject: [PATCH] Store the type ID for __builtin_va_list in the PCH file, so that the AST context's __builtin_va_list type will be set when the PCH file is loaded. This fixes the crash when CodeGen'ing a va_arg expression pulled in from a PCH file. llvm-svn: 69421 --- clang/include/clang/Frontend/PCHBitCodes.h | 21 ++++++++++++++++++++- clang/include/clang/Frontend/PCHReader.h | 3 +++ clang/lib/Frontend/PCHReader.cpp | 8 ++++++++ clang/lib/Frontend/PCHWriter.cpp | 9 ++++++++- clang/test/PCH/va_arg.c | 5 ++--- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/clang/include/clang/Frontend/PCHBitCodes.h b/clang/include/clang/Frontend/PCHBitCodes.h index 8bb81676bdca..97227ceadb08 100644 --- a/clang/include/clang/Frontend/PCHBitCodes.h +++ b/clang/include/clang/Frontend/PCHBitCodes.h @@ -142,9 +142,18 @@ namespace clang { /// program (e.g., for code generation). EXTERNAL_DEFINITIONS = 7, + /// \brief Record code for the set of non-builtin, special + /// types. + /// + /// This record contains the type IDs for the various type nodes + /// that are constructed during semantic analysis (e.g., + /// __builtin_va_list). The SPECIAL_TYPE_* constants provide + /// offsets into this record. + SPECIAL_TYPES = 8, + /// \brief Record code for the block of extra statistics we /// gather while generating a PCH file. - STATISTICS = 8 + STATISTICS = 9 }; /// \brief Record types used within a source manager block. @@ -314,6 +323,16 @@ namespace clang { TYPE_OBJC_QUALIFIED_CLASS = 24 }; + /// \brief The type IDs for special types constructed by semantic + /// analysis. + /// + /// The constants in this enumeration are indices into the + /// SPECIAL_TYPES record. + enum SpecialTypeIDs { + /// \brief __builtin_va_list + SPECIAL_TYPE_BUILTIN_VA_LIST = 0 + }; + /// \brief Record codes for each kind of declaration. /// /// These constants describe the records that can occur within a diff --git a/clang/include/clang/Frontend/PCHReader.h b/clang/include/clang/Frontend/PCHReader.h index 34cf7bc1aadc..e08aa75f0886 100644 --- a/clang/include/clang/Frontend/PCHReader.h +++ b/clang/include/clang/Frontend/PCHReader.h @@ -157,6 +157,9 @@ private: /// in the PCH file. unsigned TotalNumStatements; + /// \brief + llvm::SmallVector SpecialTypes; + PCHReadResult ReadPCHBlock(); bool CheckPredefinesBuffer(const char *PCHPredef, unsigned PCHPredefLen, diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp index dc8d3fce34fb..6c79b8a5a57d 100644 --- a/clang/lib/Frontend/PCHReader.cpp +++ b/clang/lib/Frontend/PCHReader.cpp @@ -1316,6 +1316,10 @@ PCHReader::PCHReadResult PCHReader::ReadPCHBlock() { ExternalDefinitions.swap(Record); break; + case pch::SPECIAL_TYPES: + SpecialTypes.swap(Record); + break; + case pch::STATISTICS: TotalNumStatements = Record[0]; break; @@ -1399,6 +1403,10 @@ PCHReader::PCHReadResult PCHReader::ReadPCH(const std::string &FileName) { // Load the translation unit declaration ReadDeclRecord(DeclOffsets[0], 0); + // Load the special types. + Context.setBuiltinVaListType( + GetType(SpecialTypes[pch::SPECIAL_TYPE_BUILTIN_VA_LIST])); + return Success; } diff --git a/clang/lib/Frontend/PCHWriter.cpp b/clang/lib/Frontend/PCHWriter.cpp index d7f0cd3497fd..db9a1cebe569 100644 --- a/clang/lib/Frontend/PCHWriter.cpp +++ b/clang/lib/Frontend/PCHWriter.cpp @@ -1739,6 +1739,7 @@ void PCHWriter::WritePCH(ASTContext &Context, const Preprocessor &PP) { DeclsToEmit.push(Context.getTranslationUnitDecl()); // Write the remaining PCH contents. + RecordData Record; Stream.EnterSubblock(pch::PCH_BLOCK_ID, 3); WriteTargetTriple(Context.Target); WriteLanguageOptions(Context.getLangOptions()); @@ -1749,11 +1750,17 @@ void PCHWriter::WritePCH(ASTContext &Context, const Preprocessor &PP) { WriteIdentifierTable(); Stream.EmitRecord(pch::TYPE_OFFSET, TypeOffsets); Stream.EmitRecord(pch::DECL_OFFSET, DeclOffsets); + + // Write the record of special types. + Record.clear(); + AddTypeRef(Context.getBuiltinVaListType(), Record); + Stream.EmitRecord(pch::SPECIAL_TYPES, Record); + if (!ExternalDefinitions.empty()) Stream.EmitRecord(pch::EXTERNAL_DEFINITIONS, ExternalDefinitions); // Some simple statistics - RecordData Record; + Record.clear(); Record.push_back(NumStatements); Stream.EmitRecord(pch::STATISTICS, Record); Stream.ExitBlock(); diff --git a/clang/test/PCH/va_arg.c b/clang/test/PCH/va_arg.c index aec55acbebed..91c6b77a335b 100644 --- a/clang/test/PCH/va_arg.c +++ b/clang/test/PCH/va_arg.c @@ -1,11 +1,10 @@ // Test this without pch. -// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include %S/va_arg.h %s +// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include %S/va_arg.h %s -emit-llvm -o - // Test with pch. // RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -o %t %S/va_arg.h && -// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include-pch %t %s +// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include-pch %t %s -emit-llvm -o - -// FIXME: Crash when emitting LLVM bitcode using PCH! char *g0(char** argv, int argc) { return argv[argc]; } char *g(char **argv) {