From: Chris Lattner Date: Mon, 27 Apr 2009 05:46:25 +0000 (+0000) Subject: rename GetStmt -> GetDeclStmt to make it clear that the stmt read X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=887e2b375fc5e00084ec7bf3dd050c2ca399a6d2;p=clang rename GetStmt -> GetDeclStmt to make it clear that the stmt read is part of a decl. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70189 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index da3459a016..1aabf7d3e6 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -498,7 +498,7 @@ private: /// FunctionDecl object to save an allocation like FunctionType does. ParmVarDecl **ParamInfo; - LazyStmtPtr Body; + LazyDeclStmtPtr Body; /// PreviousDeclaration - A link to the previous declaration of this /// same function, NULL if this is the first declaration. For diff --git a/include/clang/AST/ExternalASTSource.h b/include/clang/AST/ExternalASTSource.h index ef09770933..db8a97034f 100644 --- a/include/clang/AST/ExternalASTSource.h +++ b/include/clang/AST/ExternalASTSource.h @@ -65,12 +65,13 @@ public: /// building a new declaration. virtual Decl *GetDecl(unsigned ID) = 0; - /// \brief Resolve the offset of a statement into a statement. + /// \brief Resolve the offset of a statement in the decl stream into a + /// statement. /// /// This operation will read a new statement from the external /// source each time it is called, and is meant to be used via a /// LazyOffsetPtr. - virtual Stmt *GetStmt(uint64_t Offset) = 0; + virtual Stmt *GetDeclStmt(uint64_t Offset) = 0; /// \brief Read all of the declarations lexically stored in a /// declaration context. @@ -176,7 +177,7 @@ public: }; /// \brief A lazy pointer to a statement. -typedef LazyOffsetPtr LazyStmtPtr; +typedef LazyOffsetPtr LazyDeclStmtPtr; } // end namespace clang diff --git a/include/clang/Frontend/PCHReader.h b/include/clang/Frontend/PCHReader.h index b9edd8ff83..5e75f72061 100644 --- a/include/clang/Frontend/PCHReader.h +++ b/include/clang/Frontend/PCHReader.h @@ -288,8 +288,8 @@ public: /// /// This operation will read a new statement from the external /// source each time it is called, and is meant to be used via a - /// LazyOffsetPtr. - virtual Stmt *GetStmt(uint64_t Offset); + /// LazyOffsetPtr (which is used by Decls for the body of functions, etc). + virtual Stmt *GetDeclStmt(uint64_t Offset); /// ReadBlockAbbrevs - Enter a subblock of the specified BlockID with the /// specified cursor. Read the abbreviations that are at the top of the block diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index 4ea1e05b88..4ec2a3a18a 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1331,7 +1331,12 @@ Decl *PCHReader::GetDecl(pch::DeclID ID) { return DeclsLoaded[Index]; } -Stmt *PCHReader::GetStmt(uint64_t Offset) { +/// \brief Resolve the offset of a statement into a statement. +/// +/// This operation will read a new statement from the external +/// source each time it is called, and is meant to be used via a +/// LazyOffsetPtr (which is used by Decls for the body of functions, etc). +Stmt *PCHReader::GetDeclStmt(uint64_t Offset) { // Keep track of where we are in the stream, then jump back there // after reading this declaration. SavedStreamPosition SavedPosition(Stream);