diff --git a/llvm/test/CodeGen/Mips/msa/emergency-spill.mir b/llvm/test/CodeGen/Mips/msa/emergency-spill.mir
index 502b60f673e2..a53368e0342a 100644
--- a/llvm/test/CodeGen/Mips/msa/emergency-spill.mir
+++ b/llvm/test/CodeGen/Mips/msa/emergency-spill.mir
@@ -102,32 +102,23 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: retval, type: default, offset: 0, size: 16, alignment: 16,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 1, name: a, type: default, offset: 0, size: 16, alignment: 16,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 2, name: b, type: default, offset: 0, size: 16, alignment: 16,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 3, name: a.addr, type: default, offset: 0, size: 16, alignment: 16,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 4, name: b.addr, type: default, offset: 0, size: 16, alignment: 16,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 5, name: c.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 6, name: g, type: default, offset: 0, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 7, name: d, type: default, offset: 0, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
   - { id: 8, name: '', type: default, offset: 0, size: 6400,
-      alignment: 16, stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
-      di-variable: '', di-expression: '', di-location: '' }
+      alignment: 16, callee-saved-register: '', di-variable: '', di-expression: '', di-location: '' }
 constants:
 body:             |
   bb.0.entry: