Author: hyd-dev Date: 2020-06-11T13:37:01-04:00 New Revision: 95d7ccb70b9cbd53f1f137c0b2411852c42c122b
URL: https://github.com/llvm/llvm-project/commit/95d7ccb70b9cbd53f1f137c0b2411852c42c122b DIFF: https://github.com/llvm/llvm-project/commit/95d7ccb70b9cbd53f1f137c0b2411852c42c122b.diff LOG: [PCH] Support writing BuiltinBitCastExprs to PCHs eee944e7f adds the new BuiltinBitCastExpr, but does not set the Code member of ASTStmtWriter. This is not correct and causes an assertion failue in ASTStmtWriter::emit() when building PCHs that contain __builtin_bit_cast. This commit adds serialization::EXPR_BUILTIN_BIT_CAST and handles ASTStmtWriter::Code properly. Differential revision: https://reviews.llvm.org/D80360 Added: clang/test/PCH/builtin-bit-cast.cpp Modified: clang/include/clang/AST/ExprCXX.h clang/include/clang/Serialization/ASTBitCodes.h clang/lib/Serialization/ASTReaderStmt.cpp clang/lib/Serialization/ASTWriterStmt.cpp Removed: ################################################################################ diff --git a/clang/include/clang/AST/ExprCXX.h b/clang/include/clang/AST/ExprCXX.h index 56b27d57bd5c..379f762275c6 100644 --- a/clang/include/clang/AST/ExprCXX.h +++ b/clang/include/clang/AST/ExprCXX.h @@ -4821,6 +4821,8 @@ class BuiltinBitCastExpr final : ExplicitCastExpr(BuiltinBitCastExprClass, T, VK, CK, SrcExpr, 0, DstType), KWLoc(KWLoc), RParenLoc(RParenLoc) {} + BuiltinBitCastExpr(EmptyShell Empty) + : ExplicitCastExpr(BuiltinBitCastExprClass, Empty, 0) {} SourceLocation getBeginLoc() const LLVM_READONLY { return KWLoc; } SourceLocation getEndLoc() const LLVM_READONLY { return RParenLoc; } diff --git a/clang/include/clang/Serialization/ASTBitCodes.h b/clang/include/clang/Serialization/ASTBitCodes.h index 4008f11daa15..c6f9f1d1a08f 100644 --- a/clang/include/clang/Serialization/ASTBitCodes.h +++ b/clang/include/clang/Serialization/ASTBitCodes.h @@ -1812,6 +1812,9 @@ class TypeIdx { /// A CXXFunctionalCastExpr record. EXPR_CXX_FUNCTIONAL_CAST, + /// A BuiltinBitCastExpr record. + EXPR_BUILTIN_BIT_CAST, + /// A UserDefinedLiteral record. EXPR_USER_DEFINED_LITERAL, diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp index 5c7bc7a57a9f..86895c319ee8 100644 --- a/clang/lib/Serialization/ASTReaderStmt.cpp +++ b/clang/lib/Serialization/ASTReaderStmt.cpp @@ -3618,6 +3618,11 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) { /*PathSize*/ Record[ASTStmtReader::NumExprFields]); break; + case EXPR_BUILTIN_BIT_CAST: + assert(Record[ASTStmtReader::NumExprFields] == 0 && "Wrong PathSize!"); + S = new (Context) BuiltinBitCastExpr(Empty); + break; + case EXPR_USER_DEFINED_LITERAL: S = UserDefinedLiteral::CreateEmpty( Context, /*NumArgs=*/Record[ASTStmtReader::NumExprFields], Empty); diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp b/clang/lib/Serialization/ASTWriterStmt.cpp index 5e445b6f4627..45cd54f8dc9e 100644 --- a/clang/lib/Serialization/ASTWriterStmt.cpp +++ b/clang/lib/Serialization/ASTWriterStmt.cpp @@ -1655,6 +1655,7 @@ void ASTStmtWriter::VisitBuiltinBitCastExpr(BuiltinBitCastExpr *E) { VisitExplicitCastExpr(E); Record.AddSourceLocation(E->getBeginLoc()); Record.AddSourceLocation(E->getEndLoc()); + Code = serialization::EXPR_BUILTIN_BIT_CAST; } void ASTStmtWriter::VisitUserDefinedLiteral(UserDefinedLiteral *E) { diff --git a/clang/test/PCH/builtin-bit-cast.cpp b/clang/test/PCH/builtin-bit-cast.cpp new file mode 100644 index 000000000000..5755ce965e33 --- /dev/null +++ b/clang/test/PCH/builtin-bit-cast.cpp @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -emit-pch -o %t %s +// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s +// expected-no-diagnostics + +#ifndef HEADER +#define HEADER + +template <class T, class U> +constexpr T BuiltinBitCastWrapper(const U &Arg) { + return __builtin_bit_cast(T, Arg); +} + +#else + +int main() { + return BuiltinBitCastWrapper<int>(0); +} + +#endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
