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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69421 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Frontend/PCHBitCodes.h b/include/clang/Frontend/PCHBitCodes.h
index 8bb8167..97227ce 100644
--- a/include/clang/Frontend/PCHBitCodes.h
+++ b/include/clang/Frontend/PCHBitCodes.h
@@ -142,9 +142,18 @@
/// 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 @@
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/include/clang/Frontend/PCHReader.h b/include/clang/Frontend/PCHReader.h
index 34cf7bc..e08aa75 100644
--- a/include/clang/Frontend/PCHReader.h
+++ b/include/clang/Frontend/PCHReader.h
@@ -157,6 +157,9 @@
/// in the PCH file.
unsigned TotalNumStatements;
+ /// \brief
+ llvm::SmallVector<uint64_t, 4> SpecialTypes;
+
PCHReadResult ReadPCHBlock();
bool CheckPredefinesBuffer(const char *PCHPredef,
unsigned PCHPredefLen,
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index dc8d3fc..6c79b8a 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -1316,6 +1316,10 @@
ExternalDefinitions.swap(Record);
break;
+ case pch::SPECIAL_TYPES:
+ SpecialTypes.swap(Record);
+ break;
+
case pch::STATISTICS:
TotalNumStatements = Record[0];
break;
@@ -1399,6 +1403,10 @@
// 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/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index d7f0cd3..db9a1ce 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1739,6 +1739,7 @@
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 @@
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/test/PCH/va_arg.c b/test/PCH/va_arg.c
index aec55ac..91c6b77 100644
--- a/test/PCH/va_arg.c
+++ b/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) {