From: Douglas Gregor Date: Wed, 15 Apr 2009 23:33:31 +0000 (+0000) Subject: PCH support for TypesCompatibleExpr, ChooseExpr, and GNUNullExpr. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44cae0c8669cdf83618cbe7fd36ea7a8e51cf97f;p=clang PCH support for TypesCompatibleExpr, ChooseExpr, and GNUNullExpr. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69242 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h index 921aff1001..27b76e3db7 100644 --- a/include/clang/AST/Expr.h +++ b/include/clang/AST/Expr.h @@ -1660,9 +1660,21 @@ public: Expr(TypesCompatibleExprClass, ReturnType), Type1(t1), Type2(t2), BuiltinLoc(BLoc), RParenLoc(RP) {} + /// \brief Build an empty __builtin_type_compatible_p expression. + explicit TypesCompatibleExpr(EmptyShell Empty) + : Expr(TypesCompatibleExprClass, Empty) { } + QualType getArgType1() const { return Type1; } + void setArgType1(QualType T) { Type1 = T; } QualType getArgType2() const { return Type2; } + void setArgType2(QualType T) { Type2 = T; } + SourceLocation getBuiltinLoc() const { return BuiltinLoc; } + void setBuiltinLoc(SourceLocation L) { BuiltinLoc = L; } + + SourceLocation getRParenLoc() const { return RParenLoc; } + void setRParenLoc(SourceLocation L) { RParenLoc = L; } + virtual SourceRange getSourceRange() const { return SourceRange(BuiltinLoc, RParenLoc); } @@ -1770,6 +1782,9 @@ public: SubExprs[RHS] = rhs; } + /// \brief Build an empty __builtin_choose_expr. + explicit ChooseExpr(EmptyShell Empty) : Expr(ChooseExprClass, Empty) { } + /// isConditionTrue - Return whether the condition is true (i.e. not /// equal to zero). bool isConditionTrue(ASTContext &C) const; @@ -1781,8 +1796,17 @@ public: } Expr *getCond() const { return cast(SubExprs[COND]); } + void setCond(Expr *E) { SubExprs[COND] = E; } Expr *getLHS() const { return cast(SubExprs[LHS]); } + void setLHS(Expr *E) { SubExprs[LHS] = E; } Expr *getRHS() const { return cast(SubExprs[RHS]); } + void setRHS(Expr *E) { SubExprs[RHS] = E; } + + SourceLocation getBuiltinLoc() const { return BuiltinLoc; } + void setBuiltinLoc(SourceLocation L) { BuiltinLoc = L; } + + SourceLocation getRParenLoc() const { return RParenLoc; } + void setRParenLoc(SourceLocation L) { RParenLoc = L; } virtual SourceRange getSourceRange() const { return SourceRange(BuiltinLoc, RParenLoc); @@ -1814,8 +1838,12 @@ public: GNUNullExpr(QualType Ty, SourceLocation Loc) : Expr(GNUNullExprClass, Ty), TokenLoc(Loc) { } + /// \brief Build an empty GNU __null expression. + explicit GNUNullExpr(EmptyShell Empty) : Expr(GNUNullExprClass, Empty) { } + /// getTokenLocation - The location of the __null token. SourceLocation getTokenLocation() const { return TokenLoc; } + void setTokenLocation(SourceLocation L) { TokenLoc = L; } virtual SourceRange getSourceRange() const { return SourceRange(TokenLoc); diff --git a/include/clang/Frontend/PCHBitCodes.h b/include/clang/Frontend/PCHBitCodes.h index 10169b3051..700d990721 100644 --- a/include/clang/Frontend/PCHBitCodes.h +++ b/include/clang/Frontend/PCHBitCodes.h @@ -426,7 +426,15 @@ namespace clang { /// FIXME: DesignatedInitExpr /// FIXME: ImplicitValueInitExpr /// \brief A VAArgExpr record. - EXPR_VA_ARG + EXPR_VA_ARG, + // FIXME: AddrLabelExpr + // FIXME: StmtExpr + /// \brief A TypesCompatibleExpr record. + EXPR_TYPES_COMPATIBLE, + /// \brief A ChooseExpr record. + EXPR_CHOOSE, + /// \brief A GNUNullExpr record. + EXPR_GNU_NULL }; /// @} } diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index bd1ed1f3df..67c7dc7337 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -259,6 +259,9 @@ namespace { unsigned VisitCStyleCastExpr(CStyleCastExpr *E); unsigned VisitExtVectorElementExpr(ExtVectorElementExpr *E); unsigned VisitVAArgExpr(VAArgExpr *E); + unsigned VisitTypesCompatibleExpr(TypesCompatibleExpr *E); + unsigned VisitChooseExpr(ChooseExpr *E); + unsigned VisitGNUNullExpr(GNUNullExpr *E); }; } @@ -455,6 +458,30 @@ unsigned PCHStmtReader::VisitVAArgExpr(VAArgExpr *E) { return 1; } +unsigned PCHStmtReader::VisitTypesCompatibleExpr(TypesCompatibleExpr *E) { + VisitExpr(E); + E->setArgType1(Reader.GetType(Record[Idx++])); + E->setArgType2(Reader.GetType(Record[Idx++])); + E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++])); + E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++])); + return 0; +} + +unsigned PCHStmtReader::VisitChooseExpr(ChooseExpr *E) { + VisitExpr(E); + E->setCond(ExprStack[ExprStack.size() - 3]); + E->setLHS(ExprStack[ExprStack.size() - 2]); + E->setRHS(ExprStack[ExprStack.size() - 1]); + E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++])); + E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++])); + return 3; +} + +unsigned PCHStmtReader::VisitGNUNullExpr(GNUNullExpr *E) { + VisitExpr(E); + E->setTokenLocation(SourceLocation::getFromRawEncoding(Record[Idx++])); + return 0; +} // FIXME: use the diagnostics machinery static bool Error(const char *Str) { @@ -1977,6 +2004,18 @@ Expr *PCHReader::ReadExpr() { // FIXME: untested; we need function bodies first E = new (Context) VAArgExpr(Empty); break; + + case pch::EXPR_TYPES_COMPATIBLE: + E = new (Context) TypesCompatibleExpr(Empty); + break; + + case pch::EXPR_CHOOSE: + E = new (Context) ChooseExpr(Empty); + break; + + case pch::EXPR_GNU_NULL: + E = new (Context) GNUNullExpr(Empty); + break; } // We hit an EXPR_STOP, so we're done with this expression. diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index 612eb23b52..dc5aabdd5b 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -466,6 +466,9 @@ namespace { void VisitCStyleCastExpr(CStyleCastExpr *E); void VisitExtVectorElementExpr(ExtVectorElementExpr *E); void VisitVAArgExpr(VAArgExpr *E); + void VisitTypesCompatibleExpr(TypesCompatibleExpr *E); + void VisitChooseExpr(ChooseExpr *E); + void VisitGNUNullExpr(GNUNullExpr *E); }; } @@ -655,6 +658,31 @@ void PCHStmtWriter::VisitVAArgExpr(VAArgExpr *E) { Code = pch::EXPR_VA_ARG; } +void PCHStmtWriter::VisitTypesCompatibleExpr(TypesCompatibleExpr *E) { + VisitExpr(E); + Writer.AddTypeRef(E->getArgType1(), Record); + Writer.AddTypeRef(E->getArgType2(), Record); + Writer.AddSourceLocation(E->getBuiltinLoc(), Record); + Writer.AddSourceLocation(E->getRParenLoc(), Record); + Code = pch::EXPR_TYPES_COMPATIBLE; +} + +void PCHStmtWriter::VisitChooseExpr(ChooseExpr *E) { + VisitExpr(E); + Writer.WriteSubExpr(E->getCond()); + Writer.WriteSubExpr(E->getLHS()); + Writer.WriteSubExpr(E->getRHS()); + Writer.AddSourceLocation(E->getBuiltinLoc(), Record); + Writer.AddSourceLocation(E->getRParenLoc(), Record); + Code = pch::EXPR_CHOOSE; +} + +void PCHStmtWriter::VisitGNUNullExpr(GNUNullExpr *E) { + VisitExpr(E); + Writer.AddSourceLocation(E->getTokenLocation(), Record); + Code = pch::EXPR_GNU_NULL; +} + //===----------------------------------------------------------------------===// // PCHWriter Implementation //===----------------------------------------------------------------------===// diff --git a/test/PCH/exprs.c b/test/PCH/exprs.c index 6d5a969301..5396c04216 100644 --- a/test/PCH/exprs.c +++ b/test/PCH/exprs.c @@ -63,3 +63,12 @@ void_ptr vp1 = &integer; // ExtVectorElementExpr ext_vector_element *double_ptr5 = &floating; + +// TypesCompatibleExpr +types_compatible *int_ptr7 = &integer; + +// ChooseExpr +choose_expr *int_ptr8 = &integer; + +// GNUNullExpr FIXME: needs C++ +//null_type null = __null; diff --git a/test/PCH/exprs.h b/test/PCH/exprs.h index 9637b6ed62..f02a24902f 100644 --- a/test/PCH/exprs.h +++ b/test/PCH/exprs.h @@ -60,3 +60,12 @@ typedef typeof((void *)0) void_ptr; typedef __attribute__(( ext_vector_type(2) )) double double2; double2 vec2; typedef typeof(vec2.x) ext_vector_element; + +// TypesCompatibleExpr +typedef typeof(__builtin_types_compatible_p(float, double)) types_compatible; + +// ChooseExpr +typedef typeof(__builtin_choose_expr(17 > 19, d0, 1)) choose_expr; + +// GNUNullExpr FIXME: needs C++ +// typedef typeof(__null) null_type;