diff --git a/lib/Target/RISCV/RISCVISelDAGToDAG.h b/lib/Target/RISCV/RISCVISelDAGToDAG.h
index 70480d14eba..e8b79b008fa 100644
--- a/lib/Target/RISCV/RISCVISelDAGToDAG.h
+++ b/lib/Target/RISCV/RISCVISelDAGToDAG.h
@@ -94,67 +94,67 @@ private:
 
 namespace RISCV {
 struct VLSEGPseudo {
-  uint8_t NF;
-  uint8_t Masked;
-  uint8_t Strided;
-  uint8_t FF;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
+  uint16_t NF : 4;
+  uint16_t Masked : 1;
+  uint16_t Strided : 1;
+  uint16_t FF : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VLXSEGPseudo {
-  uint8_t NF;
-  uint8_t Masked;
-  uint8_t Ordered;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
-  uint8_t IndexLMUL;
+  uint16_t NF : 4;
+  uint16_t Masked : 1;
+  uint16_t Ordered : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
+  uint16_t IndexLMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VSSEGPseudo {
-  uint8_t NF;
-  uint8_t Masked;
-  uint8_t Strided;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
+  uint16_t NF : 4;
+  uint16_t Masked : 1;
+  uint16_t Strided : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VSXSEGPseudo {
-  uint8_t NF;
-  uint8_t Masked;
-  uint8_t Ordered;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
-  uint8_t IndexLMUL;
+  uint16_t NF : 4;
+  uint16_t Masked : 1;
+  uint16_t Ordered : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
+  uint16_t IndexLMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VLEPseudo {
-  uint8_t Masked;
-  uint8_t Strided;
-  uint8_t FF;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
+  uint16_t Masked : 1;
+  uint16_t Strided : 1;
+  uint16_t FF : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VSEPseudo {
-  uint8_t Masked;
-  uint8_t Strided;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
+  uint16_t Masked :1;
+  uint16_t Strided : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
   uint16_t Pseudo;
 };
 
 struct VLX_VSXPseudo {
-  uint8_t Masked;
-  uint8_t Ordered;
-  uint8_t Log2SEW;
-  uint8_t LMUL;
-  uint8_t IndexLMUL;
+  uint16_t Masked : 1;
+  uint16_t Ordered : 1;
+  uint16_t Log2SEW : 3;
+  uint16_t LMUL : 3;
+  uint16_t IndexLMUL : 3;
   uint16_t Pseudo;
 };