X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FInstruction.h;h=89bb9fdf423d5f3f92f62be44957c21209f8459a;hb=ff96a12db635daf4f88cfea899e63a885dfaa9ed;hp=45959ccc6e59acee127e3af07cfdbf17e9d2d0aa;hpb=a09e67af330d11f32c40f04b06c899746fc396ee;p=oota-llvm.git

diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index 45959ccc6e5..89bb9fdf423 100644
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -189,7 +189,7 @@ private:
   void getAllMetadataImpl(SmallVectorImpl<std::pair<unsigned,MDNode*> > &)const;
   void getAllMetadataOtherThanDebugLocImpl(SmallVectorImpl<std::pair<unsigned,
                                            MDNode*> > &) const;
-  void removeAllMetadata();
+  void clearMetadataHashEntries();
 public:
   //===--------------------------------------------------------------------===//
   // Predicates and helper methods.
@@ -200,11 +200,10 @@ public:
   ///
   ///   Associative operators satisfy:  x op (y op z) === (x op y) op z
   ///
-  /// In LLVM, the Add, Mul, And, Or, and Xor operators are associative, when
-  /// not applied to floating point types.
+  /// In LLVM, the Add, Mul, And, Or, and Xor operators are associative.
   ///
-  bool isAssociative() const { return isAssociative(getOpcode(), getType()); }
-  static bool isAssociative(unsigned op, const Type *Ty);
+  bool isAssociative() const { return isAssociative(getOpcode()); }
+  static bool isAssociative(unsigned op);
 
   /// isCommutative - Return true if the instruction is commutative:
   ///