maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Unbreak the build from r239740. 

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

llvm-svn: 239746
This commit is contained in:
Sanjoy Das 2015-06-15 19:29:44 +00:00
parent e25147626c
commit baeb678a91
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/docs/FaultMaps.rst
View File

@ -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
}

14
llvm/include/llvm/CodeGen/FaultMaps.h
View File

@ -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) {}
};

8
llvm/lib/CodeGen/FaultMaps.cpp
View File

@ -25,7 +25,7 @@ const char *FaultMaps::WFMP = "Fault Maps: ";
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 MCSymbol *FnLabel,
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 MCSymbol *FnLabel,
}
const char *FaultMaps::faultTypeToString(FaultMaps::FaultType FT) {
const char *FaultMaps::faultTypeToString(FaultMaps::FaultKind FT) {
switch (FT) {
default:
llvm_unreachable("unhandled fault type!");