More changes due to shift from Union to std::variant

Signed-off-by: Arvind Sudarsanam <[email protected]>

Author: asudarsa

llvm/include/llvm/Support/PropertySetIO.h

@@ -150,7 +150,7 @@ class PropertyValue {
   template <typename T> void set(T V) {
     if (getTypeTag<T>() != Ty)
       llvm_unreachable("invalid type tag for this operation");
-    getValueRef<T>() = V;
+    Val = V;
   }
 
   Type getType() const { return Ty; }
@@ -167,7 +167,6 @@ class PropertyValue {
   }
 
 private:
-  template <typename T> T &getValueRef();
   void copy(const PropertyValue &P);
 
   Type Ty = NONE;

llvm/lib/Support/PropertySetIO.cpp

@@ -134,15 +134,6 @@ void PropertySetRegistry::write(raw_ostream &Out) const {
 namespace llvm {
 namespace util {
 
-template <> uint32_t &PropertyValue::getValueRef<uint32_t>() {
-  return std::get<uint32_t>(Val);
-}
-
-template <> byte *&PropertyValue::getValueRef<byte *>() {
-  auto &ByteArrayVal = std::get<byte *>(Val);
-  return ByteArrayVal;
-}
-
 template <> PropertyValue::Type PropertyValue::getTypeTag<uint32_t>() {
   return UINT32;
 }