diff options
-rw-r--r-- | include/llvm/Type.h | 12 | ||||
-rw-r--r-- | lib/VMCore/Type.cpp | 19 |
2 files changed, 19 insertions, 12 deletions
diff --git a/include/llvm/Type.h b/include/llvm/Type.h index c79aed6..9f73b25 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -401,18 +401,6 @@ inline void PATypeHolder::dropRef() { Ty->dropRef(); } -/// get - This implements the forwarding part of the union-find algorithm for -/// abstract types. Before every access to the Type*, we check to see if the -/// type we are pointing to is forwarding to a new type. If so, we drop our -/// reference to the type. -/// -inline Type* PATypeHolder::get() const { - const Type *NewTy = Ty->getForwardedType(); - if (!NewTy) return const_cast<Type*>(Ty); - return *const_cast<PATypeHolder*>(this) = NewTy; -} - - //===----------------------------------------------------------------------===// // Provide specializations of GraphTraits to be able to treat a type as a diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index a393556..1fdec94 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -33,6 +33,25 @@ using namespace llvm; AbstractTypeUser::~AbstractTypeUser() {} + +//===----------------------------------------------------------------------===// +// Type PATypeHolder Implementation +//===----------------------------------------------------------------------===// + +// This routine was moved here to resolve a cyclic dependency caused by +// inline heuristics. + +/// get - This implements the forwarding part of the union-find algorithm for +/// abstract types. Before every access to the Type*, we check to see if the +/// type we are pointing to is forwarding to a new type. If so, we drop our +/// reference to the type. +/// +Type* PATypeHolder::get() const { + const Type *NewTy = Ty->getForwardedType(); + if (!NewTy) return const_cast<Type*>(Ty); + return *const_cast<PATypeHolder*>(this) = NewTy; +} + //===----------------------------------------------------------------------===// // Type Class Implementation //===----------------------------------------------------------------------===// |