diff --git a/lib/Target/MSP430/MSP430RegisterInfo.td b/lib/Target/MSP430/MSP430RegisterInfo.td
index 4078626ea2d..db3f0e789ab 100644
--- a/lib/Target/MSP430/MSP430RegisterInfo.td
+++ b/lib/Target/MSP430/MSP430RegisterInfo.td
@@ -65,7 +65,10 @@ def : SubRegSet<1, [PCW, SPW, SRW, CGW, FPW,
                    [PCB, SPB, SRB, CGB, FPB,
                     R5B, R6B, R7B, R8B, R9B, R10B, R11B, R12B, R13B, R14B, R15B]>;
 
-def subreg_8bit : PatLeaf<(i32 1)>;
+def subreg_8bit : SubRegIndex {
+  let NumberHack = 1;
+  let Namespace = "MSP430";
+}
 
 def GR8 : RegisterClass<"MSP430", [i8], 8,
    // Volatile registers