diff options
Diffstat (limited to 'include/clang/AST/Stmt.h')
| -rw-r--r-- | include/clang/AST/Stmt.h | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h index bf5f383be5e0..2a6fd6bc964c 100644 --- a/include/clang/AST/Stmt.h +++ b/include/clang/AST/Stmt.h @@ -14,16 +14,15 @@ #ifndef LLVM_CLANG_AST_STMT_H #define LLVM_CLANG_AST_STMT_H -#include "llvm/Support/Casting.h" -#include "llvm/Support/raw_ostream.h" +#include "clang/Basic/LLVM.h" #include "clang/Basic/SourceLocation.h" #include "clang/AST/PrettyPrinter.h" #include "clang/AST/StmtIterator.h" #include "clang/AST/DeclGroup.h" -#include "llvm/ADT/SmallVector.h" #include "clang/AST/ASTContext.h" +#include "llvm/Support/raw_ostream.h" +#include "llvm/ADT/SmallVector.h" #include <string> -using llvm::dyn_cast_or_null; namespace llvm { class FoldingSetNodeID; @@ -108,11 +107,10 @@ public: // Make vanilla 'new' and 'delete' illegal for Stmts. protected: void* operator new(size_t bytes) throw() { - assert(0 && "Stmts cannot be allocated with regular 'new'."); - return 0; + llvm_unreachable("Stmts cannot be allocated with regular 'new'."); } void operator delete(void* data) throw() { - assert(0 && "Stmts cannot be released with regular 'delete'."); + llvm_unreachable("Stmts cannot be released with regular 'delete'."); } class StmtBitfields { @@ -148,6 +146,7 @@ protected: friend class CXXUnresolvedConstructExpr; // ctor friend class CXXDependentScopeMemberExpr; // ctor friend class OverloadExpr; // ctor + friend class AtomicExpr; // ctor unsigned : NumStmtBits; unsigned ValueKind : 2; @@ -167,6 +166,7 @@ protected: unsigned HasQualifier : 1; unsigned HasExplicitTemplateArgs : 1; unsigned HasFoundDecl : 1; + unsigned HadMultipleCandidates : 1; }; class CastExprBitfields { @@ -270,7 +270,7 @@ public: /// This is useful in a debugger. void dump() const; void dump(SourceManager &SM) const; - void dump(llvm::raw_ostream &OS, SourceManager &SM) const; + void dump(raw_ostream &OS, SourceManager &SM) const; /// dumpAll - This does a dump of the specified AST fragment and all subtrees. void dumpAll() const; @@ -279,12 +279,12 @@ public: /// dumpPretty/printPretty - These two methods do a "pretty print" of the AST /// back to its original source language syntax. void dumpPretty(ASTContext& Context) const; - void printPretty(llvm::raw_ostream &OS, PrinterHelper *Helper, + void printPretty(raw_ostream &OS, PrinterHelper *Helper, const PrintingPolicy &Policy, unsigned Indentation = 0) const { printPretty(OS, *(ASTContext*)0, Helper, Policy, Indentation); } - void printPretty(llvm::raw_ostream &OS, ASTContext &Context, + void printPretty(raw_ostream &OS, ASTContext &Context, PrinterHelper *Helper, const PrintingPolicy &Policy, unsigned Indentation = 0) const; @@ -297,6 +297,12 @@ public: /// statement, such as ExprWithCleanups or ImplicitCastExpr nodes. Stmt *IgnoreImplicit(); + const Stmt *stripLabelLikeStatements() const; + Stmt *stripLabelLikeStatements() { + return const_cast<Stmt*>( + const_cast<const Stmt*>(this)->stripLabelLikeStatements()); + } + // Implement isa<T> support. static bool classof(const Stmt *) { return true; } @@ -407,25 +413,25 @@ public: class NullStmt : public Stmt { SourceLocation SemiLoc; - /// \brief If the null statement was preceded by an empty macro this is - /// its instantiation source location, e.g: + /// \brief True if the null statement was preceded by an empty macro, e.g: /// @code /// #define CALL(x) /// CALL(0); /// @endcode - SourceLocation LeadingEmptyMacro; + bool HasLeadingEmptyMacro; public: - NullStmt(SourceLocation L, SourceLocation LeadingEmptyMacro =SourceLocation()) - : Stmt(NullStmtClass), SemiLoc(L), LeadingEmptyMacro(LeadingEmptyMacro) {} + NullStmt(SourceLocation L, bool hasLeadingEmptyMacro = false) + : Stmt(NullStmtClass), SemiLoc(L), + HasLeadingEmptyMacro(hasLeadingEmptyMacro) {} /// \brief Build an empty null statement. - explicit NullStmt(EmptyShell Empty) : Stmt(NullStmtClass, Empty) { } + explicit NullStmt(EmptyShell Empty) : Stmt(NullStmtClass, Empty), + HasLeadingEmptyMacro(false) { } SourceLocation getSemiLoc() const { return SemiLoc; } void setSemiLoc(SourceLocation L) { SemiLoc = L; } - bool hasLeadingEmptyMacro() const { return LeadingEmptyMacro.isValid(); } - SourceLocation getLeadingEmptyMacroLoc() const { return LeadingEmptyMacro; } + bool hasLeadingEmptyMacro() const { return HasLeadingEmptyMacro; } SourceRange getSourceRange() const { return SourceRange(SemiLoc); } @@ -525,6 +531,10 @@ public: child_range children() { return child_range(&Body[0], &Body[0]+CompoundStmtBits.NumStmts); } + + const_child_range children() const { + return child_range(&Body[0], &Body[0]+CompoundStmtBits.NumStmts); + } }; // SwitchCase is the base class for CaseStmt and DefaultStmt, @@ -1308,7 +1318,7 @@ public: /// true, otherwise return false. This handles canonicalization and /// translation of strings from GCC syntax to LLVM IR syntax, and handles //// flattening of named references like %[foo] to Operand AsmStringPiece's. - unsigned AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece> &Pieces, + unsigned AnalyzeAsmString(SmallVectorImpl<AsmStringPiece> &Pieces, ASTContext &C, unsigned &DiagOffs) const; @@ -1320,17 +1330,17 @@ public: return Names[i]; } - llvm::StringRef getOutputName(unsigned i) const { + StringRef getOutputName(unsigned i) const { if (IdentifierInfo *II = getOutputIdentifier(i)) return II->getName(); - return llvm::StringRef(); + return StringRef(); } /// getOutputConstraint - Return the constraint string for the specified /// output operand. All output constraints are known to be non-empty (either /// '=' or '+'). - llvm::StringRef getOutputConstraint(unsigned i) const; + StringRef getOutputConstraint(unsigned i) const; const StringLiteral *getOutputConstraintLiteral(unsigned i) const { return Constraints[i]; @@ -1364,16 +1374,16 @@ public: return Names[i + NumOutputs]; } - llvm::StringRef getInputName(unsigned i) const { + StringRef getInputName(unsigned i) const { if (IdentifierInfo *II = getInputIdentifier(i)) return II->getName(); - return llvm::StringRef(); + return StringRef(); } /// getInputConstraint - Return the specified input constraint. Unlike output /// constraints, these can be empty. - llvm::StringRef getInputConstraint(unsigned i) const; + StringRef getInputConstraint(unsigned i) const; const StringLiteral *getInputConstraintLiteral(unsigned i) const { return Constraints[i + NumOutputs]; @@ -1403,7 +1413,7 @@ public: /// getNamedOperand - Given a symbolic operand reference like %[foo], /// translate this into a numeric value needed to reference the same operand. /// This returns -1 if the operand name is invalid. - int getNamedOperand(llvm::StringRef SymbolicName) const; + int getNamedOperand(StringRef SymbolicName) const; unsigned getNumClobbers() const { return NumClobbers; } StringLiteral *getClobber(unsigned i) { return Clobbers[i]; } |