diff --git a/llvm/lib/Target/Lanai/Lanai.td b/llvm/lib/Target/Lanai/Lanai.td
--- a/llvm/lib/Target/Lanai/Lanai.td
+++ b/llvm/lib/Target/Lanai/Lanai.td
@@ -21,9 +21,7 @@
 include "LanaiCallingConv.td"
 include "LanaiInstrInfo.td"
 
-def LanaiInstrInfo : InstrInfo {
-  let useDeprecatedPositionallyEncodedOperands = 1;
-}
+def LanaiInstrInfo : InstrInfo;
 
 //===----------------------------------------------------------------------===//
 // Lanai processors supported.
diff --git a/llvm/lib/Target/Lanai/LanaiInstrFormats.td b/llvm/lib/Target/Lanai/LanaiInstrFormats.td
--- a/llvm/lib/Target/Lanai/LanaiInstrFormats.td
+++ b/llvm/lib/Target/Lanai/LanaiInstrFormats.td
@@ -197,8 +197,8 @@
     : InstLanai<outs, ins, asmstr, pattern> {
   bits<5> Rd;
   bits<5> Rs1;
-  bit P;
-  bit Q;
+  bits<1> P;
+  bits<1> Q;
   bits<16> imm16;
   // Dummy variables to allow multiclass definition of RM and RRM
   bits<2> YL;
@@ -259,8 +259,8 @@
   bits<5> Rd;
   bits<5> Rs1;
   bits<5> Rs2;
-  bit P;
-  bit Q;
+  bits<1> P;
+  bits<1> Q;
   bits<3> BBB;
   bits<5> JJJJJ;
   bits<2> YL;
@@ -504,8 +504,8 @@
   bit Y;
   bit S;
   bit E;
-  bit P;
-  bit Q;
+  bits<1> P;
+  bits<1> Q;
   bits<10> imm10;
 
   let Opcode = 0b1111;