aboutsummaryrefslogtreecommitdiff
path: root/include/clang
diff options
context:
space:
mode:
Diffstat (limited to 'include/clang')
-rw-r--r--include/clang/AST/Decl.h3
-rw-r--r--include/clang/AST/DeclBase.h13
-rw-r--r--include/clang/AST/DeclContextInternals.h135
-rw-r--r--include/clang/AST/DeclVisitor.h3
-rw-r--r--include/clang/AST/Stmt.h5
5 files changed, 152 insertions, 7 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 39a990a2db..a2ad29015e 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -870,6 +870,9 @@ protected:
: NamedDecl(DK, DC, L, Id), TypeForDecl(0) {}
public:
+ // Low-level accessor
+ Type *getTypeForDecl() const { return TypeForDecl; }
+
// Implement isa/cast/dyncast/etc.
static bool classof(const Decl *D) {
return D->getKind() >= TypeFirst && D->getKind() <= TypeLast;
diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index abdb10dcbc..4194ba0459 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -375,10 +375,6 @@ class DeclContext {
/// another pointer.
Decl *LastDecl;
- /// isLookupMap - Determine if the lookup structure is a
- /// DenseMap. Othewise, it is an array.
- bool isLookupMap() const { return LookupPtr.getInt() == LookupIsMap; }
-
protected:
DeclContext(Decl::Kind K)
: DeclKind(K), LookupPtr(), FirstDecl(0), LastDecl(0) { }
@@ -761,6 +757,15 @@ public:
return getUsingDirectives().second;
}
+ // Low-level accessors
+
+ /// \brief Determine if the lookup structure is a
+ /// DenseMap. Othewise, it is an array.
+ bool isLookupMap() const { return LookupPtr.getInt() == LookupIsMap; }
+
+ /// \brief Retrieve the internal representation of the lookup structure.
+ llvm::PointerIntPair<void*, 3> getLookupPtr() const { return LookupPtr; }
+
static bool classof(const Decl *D);
static bool classof(const DeclContext *D) { return true; }
#define DECL_CONTEXT(Name) \
diff --git a/include/clang/AST/DeclContextInternals.h b/include/clang/AST/DeclContextInternals.h
new file mode 100644
index 0000000000..0aa50a1f98
--- /dev/null
+++ b/include/clang/AST/DeclContextInternals.h
@@ -0,0 +1,135 @@
+//===-- DeclContextInternals.h - DeclContext Representation -----*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the data structures used in the implementation
+// of DeclContext.
+//
+//===----------------------------------------------------------------------===//
+#ifndef LLVM_CLANG_AST_DECLCONTEXTINTERNALS_H
+#define LLVM_CLANG_AST_DECLCONTEXTINTERNALS_H
+
+#include "clang/AST/DeclBase.h"
+#include "clang/AST/DeclarationName.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/PointerUnion.h"
+#include "llvm/ADT/SmallVector.h"
+
+namespace clang {
+
+/// StoredDeclsList - This is an array of decls optimized a common case of only
+/// containing one entry.
+struct StoredDeclsList {
+ /// VectorTy - When in vector form, this is what the Data pointer points to.
+ typedef llvm::SmallVector<NamedDecl*, 4> VectorTy;
+
+ /// Data - Union of NamedDecl*/VectorTy*.
+ llvm::PointerUnion<NamedDecl*, VectorTy*> Data;
+public:
+ StoredDeclsList() {}
+ StoredDeclsList(const StoredDeclsList &RHS) : Data(RHS.Data) {
+ if (isVector())
+ Data = new VectorTy(*Data.get<VectorTy*>());
+ }
+
+ ~StoredDeclsList() {
+ // If this is a vector-form, free the vector.
+ if (isVector())
+ delete Data.get<VectorTy*>();
+ }
+
+ StoredDeclsList &operator=(const StoredDeclsList &RHS) {
+ if (isVector())
+ delete Data.get<VectorTy*>();
+ Data = RHS.Data;
+ if (isVector())
+ Data = new VectorTy(*Data.get<VectorTy*>());
+ return *this;
+ }
+
+ bool isVector() const { return Data.is<VectorTy*>(); }
+ bool isInline() const { return Data.is<NamedDecl*>(); }
+ bool isNull() const { return Data.isNull(); }
+
+ void setOnlyValue(NamedDecl *ND) {
+ assert(isInline() && "Not inline");
+ Data = ND;
+ }
+
+ /// getLookupResult - Return an array of all the decls that this list
+ /// represents.
+ DeclContext::lookup_result getLookupResult() {
+ // If we have a single inline unit, return it.
+ if (isInline()) {
+ assert(!isNull() && "Empty list isn't allowed");
+
+ // Data is a raw pointer to a NamedDecl*, return it.
+ void *Ptr = &Data;
+ return DeclContext::lookup_result((NamedDecl**)Ptr, (NamedDecl**)Ptr+1);
+ }
+
+ // Otherwise, we have a range result.
+ VectorTy &V = *Data.get<VectorTy*>();
+ return DeclContext::lookup_result(&V[0], &V[0]+V.size());
+ }
+
+ /// HandleRedeclaration - If this is a redeclaration of an existing decl,
+ /// replace the old one with D and return true. Otherwise return false.
+ bool HandleRedeclaration(NamedDecl *D) {
+ // Most decls only have one entry in their list, special case it.
+ if (isInline()) {
+ if (!D->declarationReplaces(Data.get<NamedDecl*>()))
+ return false;
+ setOnlyValue(D);
+ return true;
+ }
+
+ // Determine if this declaration is actually a redeclaration.
+ VectorTy &Vec = *Data.get<VectorTy*>();
+ VectorTy::iterator RDI
+ = std::find_if(Vec.begin(), Vec.end(),
+ std::bind1st(std::mem_fun(&NamedDecl::declarationReplaces),
+ D));
+ if (RDI == Vec.end())
+ return false;
+ *RDI = D;
+ return true;
+ }
+
+ /// AddSubsequentDecl - This is called on the second and later decl when it is
+ /// not a redeclaration to merge it into the appropriate place in our list.
+ ///
+ void AddSubsequentDecl(NamedDecl *D) {
+ // If this is the second decl added to the list, convert this to vector
+ // form.
+ if (isInline()) {
+ NamedDecl *OldD = Data.get<NamedDecl*>();
+ VectorTy *VT = new VectorTy();
+ VT->push_back(OldD);
+ Data = VT;
+ }
+
+ VectorTy &Vec = *Data.get<VectorTy*>();
+ if (isa<UsingDirectiveDecl>(D) ||
+ D->getIdentifierNamespace() == Decl::IDNS_Tag)
+ Vec.push_back(D);
+ else if (Vec.back()->getIdentifierNamespace() == Decl::IDNS_Tag) {
+ NamedDecl *TagD = Vec.back();
+ Vec.back() = D;
+ Vec.push_back(TagD);
+ } else
+ Vec.push_back(D);
+ }
+};
+
+typedef llvm::DenseMap<DeclarationName, StoredDeclsList> StoredDeclsMap;
+
+
+} // end namespace clang
+
+#endif
diff --git a/include/clang/AST/DeclVisitor.h b/include/clang/AST/DeclVisitor.h
index 28c10c7e18..9423c319c3 100644
--- a/include/clang/AST/DeclVisitor.h
+++ b/include/clang/AST/DeclVisitor.h
@@ -13,6 +13,9 @@
#ifndef LLVM_CLANG_AST_DECLVISITOR_H
#define LLVM_CLANG_AST_DECLVISITOR_H
+#include "clang/AST/Decl.h"
+#include "clang/AST/DeclObjC.h"
+#include "clang/AST/DeclCXX.h"
#include "clang/AST/DeclTemplate.h"
namespace clang {
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index 11023234b0..c99f0a9b2f 100644
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -587,9 +587,8 @@ public:
SwitchLoc = SL;
}
void addSwitchCase(SwitchCase *SC) {
- if (FirstCase)
- SC->setNextSwitchCase(FirstCase);
-
+ assert(!SC->getNextSwitchCase() && "case/default already added to a switch");
+ SC->setNextSwitchCase(FirstCase);
FirstCase = SC;
}
virtual SourceRange getSourceRange() const {
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-07-24 22:57:28 +0000