RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-08 21:37:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PSV] Update API to be able to use TargetCustom without UB.

Browse Source 
getTargetCustom() requires values for "Kind" in the constructor
that are not in the PSVKind enum. Passing a value that is not inside
an enum as an argument to a constructor of the type of the enum is
UB. Changing to the underlying type of the enum would solve the UB

Differential Revision: https://reviews.llvm.org/D50909

llvm-svn: 340200
This commit is contained in:
Marcello Maggioni 2018-08-20 19:23:45 +00:00
parent 08e75fdaa7
commit de7eac0adc
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/CodeGen/PseudoSourceValue.h
View File

@ -36,7 +36,7 @@ raw_ostream &operator<<(raw_ostream &OS, const PseudoSourceValue* PSV);
/// below the stack frame (e.g., argument space), or constant pool.
class PseudoSourceValue {
public:
enum PSVKind {
enum PSVKind : unsigned {
Stack,
GOT,
JumpTable,
@ -48,7 +48,7 @@ public:
};
private:
PSVKind Kind;
unsigned Kind;
unsigned AddressSpace;
friend raw_ostream &llvm::operator<<(raw_ostream &OS,
const PseudoSourceValue* PSV);
@ -60,11 +60,11 @@ private:
virtual void printCustom(raw_ostream &O) const;
public:
explicit PseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII);
explicit PseudoSourceValue(unsigned Kind, const TargetInstrInfo &TII);
virtual ~PseudoSourceValue();
PSVKind kind() const { return Kind; }
unsigned kind() const { return Kind; }
bool isStack() const { return Kind == Stack; }
bool isGOT() const { return Kind == GOT; }
@ -116,7 +116,7 @@ public:
class CallEntryPseudoSourceValue : public PseudoSourceValue {
protected:
CallEntryPseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII);
CallEntryPseudoSourceValue(unsigned Kind, const TargetInstrInfo &TII);
public:
bool isConstant(const MachineFrameInfo *) const override;

2
include/llvm/CodeGen/TargetInstrInfo.h
View File

@ -1063,7 +1063,7 @@ public:
/// getAddressSpaceForPseudoSourceKind - Given the kind of memory
/// (e.g. stack) the target returns the corresponding address space.
virtual unsigned
getAddressSpaceForPseudoSourceKind(PseudoSourceValue::PSVKind Kind) const {
getAddressSpaceForPseudoSourceKind(unsigned Kind) const {
return 0;
}

4
lib/CodeGen/PseudoSourceValue.cpp
View File

@ -25,7 +25,7 @@ static const char *const PSVNames[] = {
"Stack", "GOT", "JumpTable", "ConstantPool", "FixedStack",
"GlobalValueCallEntry", "ExternalSymbolCallEntry"};
PseudoSourceValue::PseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII)
PseudoSourceValue::PseudoSourceValue(unsigned Kind, const TargetInstrInfo &TII)
: Kind(Kind) {
AddressSpace = TII.getAddressSpaceForPseudoSourceKind(Kind);
}
@ -81,7 +81,7 @@ void FixedStackPseudoSourceValue::printCustom(raw_ostream &OS) const {
}
CallEntryPseudoSourceValue::CallEntryPseudoSourceValue(
PSVKind Kind, const TargetInstrInfo &TII)
unsigned Kind, const TargetInstrInfo &TII)
: PseudoSourceValue(Kind, TII) {}
bool CallEntryPseudoSourceValue::isConstant(const MachineFrameInfo *) const {

2
lib/Target/AMDGPU/R600InstrInfo.cpp
View File

@ -1500,7 +1500,7 @@ void R600InstrInfo::clearFlag(MachineInstr &MI, unsigned Operand,
}
unsigned R600InstrInfo::getAddressSpaceForPseudoSourceKind(
PseudoSourceValue::PSVKind Kind) const {
unsigned Kind) const {
switch (Kind) {
case PseudoSourceValue::Stack:
case PseudoSourceValue::FixedStack:

2
lib/Target/AMDGPU/R600InstrInfo.h
View File

@ -324,7 +324,7 @@ public:
}
unsigned getAddressSpaceForPseudoSourceKind(
PseudoSourceValue::PSVKind Kind) const override;
unsigned Kind) const override;
};
namespace R600 {

2
lib/Target/AMDGPU/SIInstrInfo.cpp
View File

@ -1933,7 +1933,7 @@ bool SIInstrInfo::isFoldableCopy(const MachineInstr &MI) const {
}
unsigned SIInstrInfo::getAddressSpaceForPseudoSourceKind(
PseudoSourceValue::PSVKind Kind) const {
unsigned Kind) const {
switch(Kind) {
case PseudoSourceValue::Stack:
case PseudoSourceValue::FixedStack:

2
lib/Target/AMDGPU/SIInstrInfo.h
View File

@ -276,7 +276,7 @@ public:
unsigned TrueReg, unsigned FalseReg) const;
unsigned getAddressSpaceForPseudoSourceKind(
PseudoSourceValue::PSVKind Kind) const override;
unsigned Kind) const override;
bool
areMemAccessesTriviallyDisjoint(MachineInstr &MIa, MachineInstr &MIb,