[llvm-branch-commits] [llvm-branch] r126870 - in /llvm/branches/Apple/Hartnell: ./ include/llvm/CodeGen/MachineInstr.h

[Stuart Hastings]

Author: stuart
Date: Wed Mar  2 14:10:09 2011
New Revision: 126870

URL: http://llvm.org/viewvc/llvm-project?rev=126870&view=rev
Log:
Merge r119932 from trunk into Hartnell branch.  Radar 9069539.

Modified:
    llvm/branches/Apple/Hartnell/   (props changed)
    llvm/branches/Apple/Hartnell/include/llvm/CodeGen/MachineInstr.h

Propchange: llvm/branches/Apple/Hartnell/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  2 14:10:09 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Morbo:102475
-/llvm/trunk:104174-104175,105453,107846,108367,109519,109549,110987,119819,122215-122216,122462
+/llvm/trunk:104174-104175,105453,107846,108367,109519,109549,110987,119819,119932,122215-122216,122462

Modified: llvm/branches/Apple/Hartnell/include/llvm/CodeGen/MachineInstr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hartnell/include/llvm/CodeGen/MachineInstr.h?rev=126870&r1=126869&r2=126870&view=diff
==============================================================================
--- llvm/branches/Apple/Hartnell/include/llvm/CodeGen/MachineInstr.h (original)
+++ llvm/branches/Apple/Hartnell/include/llvm/CodeGen/MachineInstr.h Wed Mar  2 14:10:09 2011
@@ -126,6 +126,10 @@
   ///
   unsigned short getAsmPrinterFlags() const { return AsmPrinterFlags; }
 
+  /// clearAsmPrinterFlags - clear the AsmPrinter bitvector
+  ///
+  void clearAsmPrinterFlags() { AsmPrinterFlags = 0; }
+  
   /// getAsmPrinterFlag - Return whether an AsmPrinter flag is set.
   ///
   bool getAsmPrinterFlag(CommentFlag Flag) const {
@@ -137,6 +141,12 @@
   void setAsmPrinterFlag(CommentFlag Flag) {
     AsmPrinterFlags |= (unsigned short)Flag;
   }
+  
+  /// clearAsmPrinterFlag - clear specific AsmPrinter flags
+  ///
+  void clearAsmPrinterFlag(CommentFlag Flag) {
+    AsmPrinterFlags &= ~Flag;
+  }
 
   /// getDebugLoc - Returns the debug location id of this MachineInstr.
   ///