[llvm-commits] [llvm] r166012 - in /llvm/trunk/lib/VMCore: Attributes.cpp AttributesImpl.h

[Bill Wendling]

Author: void
Date: Tue Oct 16 00:57:28 2012
New Revision: 166012

URL: http://llvm.org/viewvc/llvm-project?rev=166012&view=rev
Log:
Have AttributesImpl defriend the Attributes class.

Modified:
    llvm/trunk/lib/VMCore/Attributes.cpp
    llvm/trunk/lib/VMCore/AttributesImpl.h

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=166012&r1=166011&r2=166012&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Oct 16 00:57:28 2012
@@ -88,7 +88,7 @@
 }
 
 uint64_t Attributes::Raw() const {
-  return Attrs ? Attrs->Bits : 0; // FIXME: Don't access this directly!
+  return Attrs ? Attrs->Raw() : 0;
 }
 
 Attributes Attributes::typeIncompatible(Type *Ty) {

Modified: llvm/trunk/lib/VMCore/AttributesImpl.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AttributesImpl.h?rev=166012&r1=166011&r2=166012&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/AttributesImpl.h (original)
+++ llvm/trunk/lib/VMCore/AttributesImpl.h Tue Oct 16 00:57:28 2012
@@ -22,9 +22,7 @@
 class Attributes;
 
 class AttributesImpl : public FoldingSetNode {
-  friend class Attributes;
   uint64_t Bits;                // FIXME: We will be expanding this.
-
 public:
   AttributesImpl(uint64_t bits) : Bits(bits) {}
 
@@ -36,6 +34,8 @@
   uint64_t getAlignment() const;
   uint64_t getStackAlignment() const;
 
+  uint64_t Raw() const { return Bits; } // FIXME: Remove.
+
   static uint64_t getAttrMask(uint64_t Val);
 
   void Profile(FoldingSetNodeID &ID) const {