From 8c3e65db520c82ae017720899fcda4a218b11a73 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 15 Oct 2012 05:40:12 +0000 Subject: [PATCH] Move the AttributesImpl header file into the VMCore directory so that it can be opaque. llvm-svn: 165920 --- llvm/include/llvm/Attributes.h | 5 +---- llvm/lib/VMCore/Attributes.cpp | 5 +++++ llvm/{include/llvm => lib/VMCore}/AttributesImpl.h | 0 llvm/lib/VMCore/LLVMContextImpl.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename llvm/{include/llvm => lib/VMCore}/AttributesImpl.h (100%) diff --git a/llvm/include/llvm/Attributes.h b/llvm/include/llvm/Attributes.h index ad33a8a..2fc7bd1 100644 --- a/llvm/include/llvm/Attributes.h +++ b/llvm/include/llvm/Attributes.h @@ -15,7 +15,6 @@ #ifndef LLVM_ATTRIBUTES_H #define LLVM_ATTRIBUTES_H -#include "llvm/AttributesImpl.h" #include "llvm/Support/MathExtras.h" #include "llvm/ADT/ArrayRef.h" #include @@ -172,9 +171,7 @@ public: bool hasAttribute(AttrVal Val) const; /// @brief Return true if attributes exist - bool hasAttributes() const { - return Attrs && Attrs->hasAttributes(); - } + bool hasAttributes() const; /// @brief Return true if the attributes are a non-null intersection. bool hasAttributes(const Attributes &A) const; diff --git a/llvm/lib/VMCore/Attributes.cpp b/llvm/lib/VMCore/Attributes.cpp index 010a356..fc5884b 100644 --- a/llvm/lib/VMCore/Attributes.cpp +++ b/llvm/lib/VMCore/Attributes.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Attributes.h" +#include "AttributesImpl.h" #include "LLVMContextImpl.h" #include "llvm/Type.h" #include "llvm/ADT/StringExtras.h" @@ -67,6 +68,10 @@ bool Attributes::hasAttribute(AttrVal Val) const { return Attrs && Attrs->hasAttribute(Val); } +bool Attributes::hasAttributes() const { + return Attrs && Attrs->hasAttributes(); +} + bool Attributes::hasAttributes(const Attributes &A) const { return Attrs && Attrs->hasAttributes(A); } diff --git a/llvm/include/llvm/AttributesImpl.h b/llvm/lib/VMCore/AttributesImpl.h similarity index 100% rename from llvm/include/llvm/AttributesImpl.h rename to llvm/lib/VMCore/AttributesImpl.h diff --git a/llvm/lib/VMCore/LLVMContextImpl.h b/llvm/lib/VMCore/LLVMContextImpl.h index 524f7e5..ee31814 100644 --- a/llvm/lib/VMCore/LLVMContextImpl.h +++ b/llvm/lib/VMCore/LLVMContextImpl.h @@ -16,9 +16,9 @@ #define LLVM_LLVMCONTEXT_IMPL_H #include "llvm/LLVMContext.h" +#include "AttributesImpl.h" #include "ConstantsContext.h" #include "LeaksContext.h" -#include "llvm/AttributesImpl.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Metadata.h" -- 2.7.4