[llvm] r239746 - Unbreak the build from r239740.

[Sanjoy Das]

Author: sanjoy
Date: Mon Jun 15 14:29:44 2015
New Revision: 239746

URL: http://llvm.org/viewvc/llvm-project?rev=239746&view=rev
Log:
Unbreak the build from r239740.

Do not re-use an enum name as a field name.  Some bots don't like this.

Modified:
    llvm/trunk/docs/FaultMaps.rst
    llvm/trunk/include/llvm/CodeGen/FaultMaps.h
    llvm/trunk/lib/CodeGen/FaultMaps.cpp

Modified: llvm/trunk/docs/FaultMaps.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/FaultMaps.rst?rev=239746&r1=239745&r2=239746&view=diff
==============================================================================
--- llvm/trunk/docs/FaultMaps.rst (original)
+++ llvm/trunk/docs/FaultMaps.rst Mon Jun 15 14:29:44 2015
@@ -47,7 +47,7 @@ The format of this section is
     uint32 : NumFaultingPCs
     uint32 : Reserved (expected to be 0)
     FunctionFaultInfo[NumFaultingPCs] {
-      uint32  : FaultType = FaultMaps::FaultingLoad (only legal value currently)
+      uint32  : FaultKind = FaultMaps::FaultingLoad (only legal value currently)
       uint32  : FaultingPCOffset
       uint32  : handlerPCOffset
     }

Modified: llvm/trunk/include/llvm/CodeGen/FaultMaps.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/FaultMaps.h?rev=239746&r1=239745&r2=239746&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/FaultMaps.h (original)
+++ llvm/trunk/include/llvm/CodeGen/FaultMaps.h Mon Jun 15 14:29:44 2015
@@ -25,30 +25,30 @@ class MCStreamer;
 
 class FaultMaps {
 public:
-  enum FaultType { FaultingLoad = 1, FaultTypeMax };
+  enum FaultKind { FaultingLoad = 1, FaultKindMax };
 
-  static const char *faultTypeToString(FaultType);
+  static const char *faultTypeToString(FaultKind);
 
   explicit FaultMaps(AsmPrinter &AP);
 
-  void recordFaultingOp(FaultType FaultTy, const MCSymbol *HandlerLabel);
+  void recordFaultingOp(FaultKind FaultTy, const MCSymbol *HandlerLabel);
   void serializeToFaultMapSection();
 
 private:
   static const char *WFMP;
 
   struct FaultInfo {
-    FaultType FaultType;
+    FaultKind Kind;
     const MCExpr *FaultingOffsetExpr;
     const MCExpr *HandlerOffsetExpr;
 
     FaultInfo()
-        : FaultType(FaultTypeMax), FaultingOffsetExpr(nullptr),
+        : Kind(FaultKindMax), FaultingOffsetExpr(nullptr),
           HandlerOffsetExpr(nullptr) {}
 
-    explicit FaultInfo(FaultMaps::FaultType FType, const MCExpr *FaultingOffset,
+    explicit FaultInfo(FaultMaps::FaultKind Kind, const MCExpr *FaultingOffset,
                        const MCExpr *HandlerOffset)
-        : FaultType(FType), FaultingOffsetExpr(FaultingOffset),
+        : Kind(Kind), FaultingOffsetExpr(FaultingOffset),
           HandlerOffsetExpr(HandlerOffset) {}
   };
 

Modified: llvm/trunk/lib/CodeGen/FaultMaps.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/FaultMaps.cpp?rev=239746&r1=239745&r2=239746&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/FaultMaps.cpp (original)
+++ llvm/trunk/lib/CodeGen/FaultMaps.cpp Mon Jun 15 14:29:44 2015
@@ -25,7 +25,7 @@ const char *FaultMaps::WFMP = "Fault Map
 
 FaultMaps::FaultMaps(AsmPrinter &AP) : AP(AP) {}
 
-void FaultMaps::recordFaultingOp(FaultType FaultTy,
+void FaultMaps::recordFaultingOp(FaultKind FaultTy,
                                  const MCSymbol *HandlerLabel) {
   MCContext &OutContext = AP.OutStreamer->getContext();
   MCSymbol *FaultingLabel = OutContext.createTempSymbol();
@@ -89,8 +89,8 @@ void FaultMaps::emitFunctionInfo(const M
 
   for (auto &Fault : FFI) {
     DEBUG(dbgs() << WFMP << "    fault type: "
-          << faultTypeToString(Fault.FaultType) << "\n");
-    OS.EmitIntValue(Fault.FaultType, 4);
+          << faultTypeToString(Fault.Kind) << "\n");
+    OS.EmitIntValue(Fault.Kind, 4);
 
     DEBUG(dbgs() << WFMP << "    faulting PC offset: "
           << *Fault.FaultingOffsetExpr << "\n");
@@ -103,7 +103,7 @@ void FaultMaps::emitFunctionInfo(const M
 }
 
 
-const char *FaultMaps::faultTypeToString(FaultMaps::FaultType FT) {
+const char *FaultMaps::faultTypeToString(FaultMaps::FaultKind FT) {
   switch (FT) {
   default:
     llvm_unreachable("unhandled fault type!");