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

Kariddi · Kariddi · commit 5ca4128b45fb · 2018-08-20T19:23:45.000Z
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
diff --git a/llvm/include/llvm/CodeGen/PseudoSourceValue.h b/llvm/include/llvm/CodeGen/PseudoSourceValue.h
@@ -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 @@ class PseudoSourceValue {
   };
 
 private:
-  PSVKind Kind;
+  unsigned Kind;
   unsigned AddressSpace;
   friend raw_ostream &llvm::operator<<(raw_ostream &OS,
                                        const PseudoSourceValue* PSV);
@@ -60,11 +60,11 @@ class PseudoSourceValue {
   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 @@ class FixedStackPseudoSourceValue : public PseudoSourceValue {
 
 class CallEntryPseudoSourceValue : public PseudoSourceValue {
 protected:
-  CallEntryPseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII);
+  CallEntryPseudoSourceValue(unsigned Kind, const TargetInstrInfo &TII);
 
 public:
   bool isConstant(const MachineFrameInfo *) const override;
diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
@@ -1063,7 +1063,7 @@ class TargetInstrInfo : public MCInstrInfo {
   /// 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;
   }
 
diff --git a/llvm/lib/CodeGen/PseudoSourceValue.cpp b/llvm/lib/CodeGen/PseudoSourceValue.cpp
@@ -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 {
diff --git a/llvm/lib/Target/AMDGPU/R600InstrInfo.cpp b/llvm/lib/Target/AMDGPU/R600InstrInfo.cpp
@@ -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:
diff --git a/llvm/lib/Target/AMDGPU/R600InstrInfo.h b/llvm/lib/Target/AMDGPU/R600InstrInfo.h
@@ -324,7 +324,7 @@ class R600InstrInfo final : public R600GenInstrInfo {
   }
 
   unsigned getAddressSpaceForPseudoSourceKind(
-      PseudoSourceValue::PSVKind Kind) const override;
+      unsigned Kind) const override;
 };
 
 namespace R600 {
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
@@ -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:
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/llvm/lib/Target/AMDGPU/SIInstrInfo.h
@@ -276,7 +276,7 @@ class SIInstrInfo final : public AMDGPUGenInstrInfo {
                           unsigned TrueReg, unsigned FalseReg) const;
 
   unsigned getAddressSpaceForPseudoSourceKind(
-             PseudoSourceValue::PSVKind Kind) const override;
+             unsigned Kind) const override;
 
   bool
   areMemAccessesTriviallyDisjoint(MachineInstr &MIa, MachineInstr &MIb,

Original file line number	Diff line number	Diff line change
`@@ -1063,7 +1063,7 @@ class TargetInstrInfo : public MCInstrInfo {`
`1063`	`1063`	`/// getAddressSpaceForPseudoSourceKind - Given the kind of memory`
`1064`	`1064`	`/// (e.g. stack) the target returns the corresponding address space.`
`1065`	`1065`	`virtual unsigned`
`1066`		`- getAddressSpaceForPseudoSourceKind(PseudoSourceValue::PSVKind Kind) const {`
	`1066`	`+ getAddressSpaceForPseudoSourceKind(unsigned Kind) const {`
`1067`	`1067`	`return 0;`
`1068`	`1068`	`}`
`1069`	`1069`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ static const char *const PSVNames[] = {`
`25`	`25`	`"Stack", "GOT", "JumpTable", "ConstantPool", "FixedStack",`
`26`	`26`	`"GlobalValueCallEntry", "ExternalSymbolCallEntry"};`
`27`	`27`
`28`		`-PseudoSourceValue::PseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII)`
	`28`	`+PseudoSourceValue::PseudoSourceValue(unsigned Kind, const TargetInstrInfo &TII)`
`29`	`29`	`: Kind(Kind) {`
`30`	`30`	`AddressSpace = TII.getAddressSpaceForPseudoSourceKind(Kind);`
`31`	`31`	`}`
`@@ -81,7 +81,7 @@ void FixedStackPseudoSourceValue::printCustom(raw_ostream &OS) const {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`CallEntryPseudoSourceValue::CallEntryPseudoSourceValue(`
`84`		`- PSVKind Kind, const TargetInstrInfo &TII)`
	`84`	`+ unsigned Kind, const TargetInstrInfo &TII)`
`85`	`85`	`: PseudoSourceValue(Kind, TII) {}`
`86`	`86`
`87`	`87`	`bool CallEntryPseudoSourceValue::isConstant(const MachineFrameInfo *) const {`
Original file line number	Diff line number	Diff line change
`@@ -1500,7 +1500,7 @@ void R600InstrInfo::clearFlag(MachineInstr &MI, unsigned Operand,`
`1500`	`1500`	`}`
`1501`	`1501`
`1502`	`1502`	`unsigned R600InstrInfo::getAddressSpaceForPseudoSourceKind(`
`1503`		`- PseudoSourceValue::PSVKind Kind) const {`
	`1503`	`+ unsigned Kind) const {`
`1504`	`1504`	`switch (Kind) {`
`1505`	`1505`	`case PseudoSourceValue::Stack:`
`1506`	`1506`	`case PseudoSourceValue::FixedStack:`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ class R600InstrInfo final : public R600GenInstrInfo {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`unsigned getAddressSpaceForPseudoSourceKind(`
`327`		`- PseudoSourceValue::PSVKind Kind) const override;`
	`327`	`+ unsigned Kind) const override;`
`328`	`328`	`};`
`329`	`329`
`330`	`330`	`namespace R600 {`
Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,7 @@ bool SIInstrInfo::isFoldableCopy(const MachineInstr &MI) const {`
`1933`	`1933`	`}`
`1934`	`1934`
`1935`	`1935`	`unsigned SIInstrInfo::getAddressSpaceForPseudoSourceKind(`
`1936`		`- PseudoSourceValue::PSVKind Kind) const {`
	`1936`	`+ unsigned Kind) const {`
`1937`	`1937`	`switch(Kind) {`
`1938`	`1938`	`case PseudoSourceValue::Stack:`
`1939`	`1939`	`case PseudoSourceValue::FixedStack:`