Describe stack-id as an enum

This patch changes MIR stack-id from an integer to an enum,
and adds printing/parsing support for this in MIR files. The default
stack-id '0' is now renamed to 'default'.

This should make MIR tests that have stack objects with different stack-ids
more descriptive. It also clarifies code operating on StackID.

Reviewers: arsenm, thegameg, qcolombet

Reviewed By: arsenm

Differential Revision: https://reviews.llvm.org/D60137

llvm-svn: 363533

27 files changed, 145 insertions, 145 deletions

diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll b/llvm/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll
index 3758df29c3b..81f29b828af 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll
@@ -33,13 +33,13 @@ define i64 @muli64(i64 %arg1, i64 %arg2) {
 ; CHECK-LABEL: name: allocai64
 ; CHECK: stack:
 ; CHECK-NEXT:   - { id: 0, name: ptr1, type: default, offset: 0, size: 8, alignment: 8,
-; CHECK-NEXT:       stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+; CHECK-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK-NEXT: debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 ; CHECK-NEXT:   - { id: 1, name: ptr2, type: default, offset: 0, size: 8, alignment: 1,
-; CHECK-NEXT:       stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+; CHECK-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 ; CHECK-NEXT:   - { id: 2, name: ptr3, type: default, offset: 0, size: 128, alignment: 8,
-; CHECK-NEXT:       stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+; CHECK-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 ; CHECK-NEXT:   - { id: 3, name: ptr4, type: default, offset: 0, size: 1, alignment: 8,
 ; CHECK: %{{[0-9]+}}:_(p0) = G_FRAME_INDEX %stack.0.ptr1
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir b/llvm/test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir
index d165a1168a5..ab4b68de2a2 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir
@@ -941,7 +941,7 @@ registers:
 frameInfo:
   maxAlignment:    2
 stack:
-  - { id: 0, name: p.addr, size: 2, alignment: 2, stack-id: 0 }
+  - { id: 0, name: p.addr, size: 2, alignment: 2, stack-id: default }
 body:             |
   bb.1.entry:
     liveins: $h0
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/call-translator.ll b/llvm/test/CodeGen/AArch64/GlobalISel/call-translator.ll
index bde62d5e0fc..8cea80caa9b 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/call-translator.ll
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/call-translator.ll
@@ -236,7 +236,7 @@ define void @test_call_stack() {
 
 ; CHECK-LABEL: name: test_mem_i1
 ; CHECK: fixedStack:
-; CHECK-NEXT: - { id: [[SLOT:[0-9]+]], type: default, offset: 0, size: 1, alignment: 16, stack-id: 0,
+; CHECK-NEXT: - { id: [[SLOT:[0-9]+]], type: default, offset: 0, size: 1, alignment: 16, stack-id: default,
 ; CHECK-NEXT: isImmutable: true,
 ; CHECK: [[ADDR:%[0-9]+]]:_(p0) = G_FRAME_INDEX %fixed-stack.[[SLOT]]
 ; CHECK: {{%[0-9]+}}:_(s1) = G_LOAD [[ADDR]](p0) :: (invariant load 1 from %fixed-stack.[[SLOT]])
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/fp128-legalize-crash-pr35690.mir b/llvm/test/CodeGen/AArch64/GlobalISel/fp128-legalize-crash-pr35690.mir
index c2ed472fcdd..304f42c050c 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/fp128-legalize-crash-pr35690.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/fp128-legalize-crash-pr35690.mir
@@ -24,7 +24,7 @@ tracksRegLiveness: true
 fixedStack:      
 stack:           
   - { id: 0, name: a.addr, type: default, offset: 0, size: 16, alignment: 16, 
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-large.mir b/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-large.mir
index ba4fdb5fa25..d8f5f5dd41a 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-large.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-large.mir
@@ -23,7 +23,7 @@ legalized:       true
 regBankSelected: true
 stack:
   - { id: 0, name: retval, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 constants:
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-tiny.mir b/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-tiny.mir
index a80467c636a..8440ceb33bb 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-tiny.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-tiny.mir
@@ -23,7 +23,7 @@ legalized:       true
 regBankSelected: true
 stack:
   - { id: 0, name: retval, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 constants:
diff --git a/llvm/test/CodeGen/AArch64/aarch64-mov-debug-locs.mir b/llvm/test/CodeGen/AArch64/aarch64-mov-debug-locs.mir
index b151d06f8a8..b90bf635c1a 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-mov-debug-locs.mir
+++ b/llvm/test/CodeGen/AArch64/aarch64-mov-debug-locs.mir
@@ -162,22 +162,22 @@ frameInfo:
 fixedStack:      []
 stack:           
   - { id: 0, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true, 
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$fp', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$fp', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true, 
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true, 
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true, 
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8, 
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true, 
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true, 
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:       []
 machineFunctionInfo: {}
diff --git a/llvm/test/CodeGen/AArch64/branch-target-enforcment.mir b/llvm/test/CodeGen/AArch64/branch-target-enforcment.mir
index 2cc6354d5db..5db503ddcee 100644
--- a/llvm/test/CodeGen/AArch64/branch-target-enforcment.mir
+++ b/llvm/test/CodeGen/AArch64/branch-target-enforcment.mir
@@ -126,7 +126,7 @@ body:             |
 name:            ptr_auth
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -16, size: 8, alignment: 16,
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 body:             |
   bb.0.entry:
@@ -150,7 +150,7 @@ body:             |
 name:            ptr_auth_b
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -16, size: 8, alignment: 16,
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 body:             |
   bb.0.entry:
diff --git a/llvm/test/CodeGen/AArch64/cfi_restore.mir b/llvm/test/CodeGen/AArch64/cfi_restore.mir
index 6d93411d322..dc244e94f09 100644
--- a/llvm/test/CodeGen/AArch64/cfi_restore.mir
+++ b/llvm/test/CodeGen/AArch64/cfi_restore.mir
@@ -8,9 +8,9 @@ frameInfo:
   maxAlignment:    8
   hasCalls:        true
 stack:
-  - { id: 0, type: spill-slot, offset: -8, size: 8, alignment: 8, stack-id: 0,
+  - { id: 0, type: spill-slot, offset: -8, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$lr' }
-  - { id: 1, type: spill-slot, offset: -16, size: 8, alignment: 8, stack-id: 0,
+  - { id: 1, type: spill-slot, offset: -16, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$fp' }
 body:             |
   bb.0:
diff --git a/llvm/test/CodeGen/AArch64/dont-shrink-wrap-stack-mayloadorstore.mir b/llvm/test/CodeGen/AArch64/dont-shrink-wrap-stack-mayloadorstore.mir
index 5cd1c201697..3a35388829a 100644
--- a/llvm/test/CodeGen/AArch64/dont-shrink-wrap-stack-mayloadorstore.mir
+++ b/llvm/test/CodeGen/AArch64/dont-shrink-wrap-stack-mayloadorstore.mir
@@ -125,7 +125,7 @@ frameInfo:
   maxCallFrameSize: 0
   localFrameSize:  64
 stack:
-  - { id: 0, name: rstack, size: 64, alignment: 4, stack-id: 0, local-offset: -64 }
+  - { id: 0, name: rstack, size: 64, alignment: 4, stack-id: default, local-offset: -64 }
 machineFunctionInfo: {}
 body:             |
   bb.0.entry:
@@ -184,7 +184,7 @@ frameInfo:
   maxCallFrameSize: 0
   localFrameSize:  4
 stack:
-  - { id: 0, name: tmp, size: 4, alignment: 4, stack-id: 0, local-offset: -4 }
+  - { id: 0, name: tmp, size: 4, alignment: 4, stack-id: default, local-offset: -4 }
 machineFunctionInfo: {}
 body:             |
   bb.0.bb:
diff --git a/llvm/test/CodeGen/AArch64/reverse-csr-restore-seq.mir b/llvm/test/CodeGen/AArch64/reverse-csr-restore-seq.mir
index 2b168b31a51..f080d7de5ce 100644
--- a/llvm/test/CodeGen/AArch64/reverse-csr-restore-seq.mir
+++ b/llvm/test/CodeGen/AArch64/reverse-csr-restore-seq.mir
@@ -47,7 +47,7 @@ name:            bar
 tracksRegLiveness: true
 stack:
   - { id : 0, size: 8, alignment: 4,
-  stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+  stack-id: default, callee-saved-register: '', callee-saved-restored: true,
   local-offset: -4, debug-info-variable: '', debug-info-expression: '',
   debug-info-location: '' }
 
diff --git a/llvm/test/CodeGen/AArch64/spill-stack-realignment.mir b/llvm/test/CodeGen/AArch64/spill-stack-realignment.mir
index a6837bc3d4b..b65318a60cd 100644
--- a/llvm/test/CodeGen/AArch64/spill-stack-realignment.mir
+++ b/llvm/test/CodeGen/AArch64/spill-stack-realignment.mir
@@ -11,10 +11,10 @@ frameInfo:
   maxAlignment:    64
 # CHECK:      stack:
 # CHECK:        id: 0, name: '', type: default, offset: -64, size: 4, alignment: 64
-# CHECK-NEXT:     stack-id: 0
+# CHECK-NEXT:     stack-id: default
 # CHECK-NEXT:     local-offset: -64
 # CHECK:        id: 1, name: '', type: default, offset: -20, size: 4, alignment: 4
-# CHECK-NEXT:     stack-id: 0
+# CHECK-NEXT:     stack-id: default
 # CHECK-NEXT:     local-offset: -68
 stack:
   - { id: 0, size: 4, alignment: 64, local-offset: -64 }
diff --git a/llvm/test/CodeGen/AArch64/stack-id-pei-alloc.mir b/llvm/test/CodeGen/AArch64/stack-id-pei-alloc.mir
index 3815240b12d..56a3d280e00 100644
--- a/llvm/test/CodeGen/AArch64/stack-id-pei-alloc.mir
+++ b/llvm/test/CodeGen/AArch64/stack-id-pei-alloc.mir
@@ -7,18 +7,18 @@
 # CHECK:      stackSize: 16
 # CHECK:      stack:
 # CHECK:        id: 0, name: '', type: default, offset: -8, size: 8, alignment: 8,
-# CHECK-NEXT:   stack-id: 0
+# CHECK-NEXT:   stack-id: default
 # CHECK:        id: 1, name: '', type: default, offset: -16, size: 8, alignment: 8,
-# CHECK-NEXT:   stack-id: 0
+# CHECK-NEXT:   stack-id: default
 # CHECK:        id: 2, name: '', type: default, offset: 0, size: 8, alignment: 8,
-# CHECK-NEXT:   stack-id: 42
+# CHECK-NEXT:   stack-id: noalloc
 name:            test_allocate
 frameInfo:
   maxAlignment:  16
 stack:
-  - { id: 0, stack-id: 0, size: 8, alignment: 8, offset: 0 }
-  - { id: 1, stack-id: 0, size: 8, alignment: 8, offset: 0 }
-  - { id: 2, stack-id: 42, size: 8, alignment: 8, offset: 0 }
+  - { id: 0, stack-id: default, size: 8, alignment: 8, offset: 0 }
+  - { id: 1, stack-id: default, size: 8, alignment: 8, offset: 0 }
+  - { id: 2, stack-id: noalloc, size: 8, alignment: 8, offset: 0 }
 body:             |
   bb.0.entry:
     RET_ReallyLR
@@ -35,8 +35,8 @@ name:            test_maxalign
 frameInfo:
   maxAlignment:  16
 stack:
-  - { id: 0, stack-id: 0, size: 16, alignment: 32 }
-  - { id: 1, stack-id: 42, size: 16, alignment: 64 }
+  - { id: 0, stack-id: default, size: 16, alignment: 32 }
+  - { id: 1, stack-id: noalloc, size: 16, alignment: 64 }
 body:             |
   bb.0.entry:
     RET_ReallyLR
@@ -48,8 +48,8 @@ name:            test_maxalign_fixedstack
 frameInfo:
   maxAlignment:  16
 fixedStack:
-  - { id: 0, stack-id: 0, size: 16, alignment: 32 }
-  - { id: 1, stack-id: 42, size: 16, alignment: 64 }
+  - { id: 0, stack-id: default, size: 16, alignment: 32 }
+  - { id: 1, stack-id: noalloc, size: 16, alignment: 64 }
 body:             |
   bb.0.entry:
     RET_ReallyLR
diff --git a/llvm/test/CodeGen/AArch64/stack-id-stackslot-scavenging.mir b/llvm/test/CodeGen/AArch64/stack-id-stackslot-scavenging.mir
index 029b0eb7612..69b9ce9faf1 100644
--- a/llvm/test/CodeGen/AArch64/stack-id-stackslot-scavenging.mir
+++ b/llvm/test/CodeGen/AArch64/stack-id-stackslot-scavenging.mir
@@ -13,7 +13,7 @@ tracksRegLiveness: true
 frameInfo:
   maxAlignment:  16
 stack:
-  - { id: 0, stack-id: 42, size: 8, alignment: 8 }
+  - { id: 0, stack-id: noalloc, size: 8, alignment: 8 }
 body:             |
   bb.0.entry:
     liveins: $x0
diff --git a/llvm/test/CodeGen/AArch64/wineh-frame5.mir b/llvm/test/CodeGen/AArch64/wineh-frame5.mir
index 2a4eed4ca92..64e9c2fa6d3 100644
--- a/llvm/test/CodeGen/AArch64/wineh-frame5.mir
+++ b/llvm/test/CodeGen/AArch64/wineh-frame5.mir
@@ -105,7 +105,7 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: B, type: default, offset: 0, size: 492, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -492, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 constants:
diff --git a/llvm/test/CodeGen/AArch64/wineh-frame6.mir b/llvm/test/CodeGen/AArch64/wineh-frame6.mir
index b86422e8097..e61e016aa51 100644
--- a/llvm/test/CodeGen/AArch64/wineh-frame6.mir
+++ b/llvm/test/CodeGen/AArch64/wineh-frame6.mir
@@ -91,31 +91,31 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: c.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: b.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -8, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 2, name: idx.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -12, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 3, name: n.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -16, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 4, name: a, type: default, offset: 0, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -24, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 5, name: '', type: variable-sized, offset: 0,
-      alignment: 1, stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      alignment: 1, stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -24, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: 0, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh-frame7.mir b/llvm/test/CodeGen/AArch64/wineh-frame7.mir
index 3e3e79eda63..c5d0920ce26 100644
--- a/llvm/test/CodeGen/AArch64/wineh-frame7.mir
+++ b/llvm/test/CodeGen/AArch64/wineh-frame7.mir
@@ -110,30 +110,30 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: retval, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: i.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -8, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 2, name: A, type: default, offset: 0, size: 2992772, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2992780, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 3, name: a, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2992784, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 4, name: B, type: default, offset: 0, size: 492, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2993276, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: 0, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh-frame8.mir b/llvm/test/CodeGen/AArch64/wineh-frame8.mir
index 6fc7416d6d6..3d50fcf7fc6 100644
--- a/llvm/test/CodeGen/AArch64/wineh-frame8.mir
+++ b/llvm/test/CodeGen/AArch64/wineh-frame8.mir
@@ -65,11 +65,11 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: a.addr, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: b, type: default, offset: 0, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -8, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 constants:
diff --git a/llvm/test/CodeGen/AArch64/wineh1.mir b/llvm/test/CodeGen/AArch64/wineh1.mir
index 593b98aa16c..b01d4cb529c 100644
--- a/llvm/test/CodeGen/AArch64/wineh1.mir
+++ b/llvm/test/CodeGen/AArch64/wineh1.mir
@@ -53,25 +53,25 @@ frameInfo:
   maxCallFrameSize: 0
   hasOpaqueSPAdjustment: true
 stack:
-  - { id: 0, type: spill-slot, offset: -8, size: 8, alignment: 8, stack-id: 0,
+  - { id: 0, type: spill-slot, offset: -8, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x19' }
-  - { id: 1, type: spill-slot, offset: -16, size: 8, alignment: 8, stack-id: 0,
+  - { id: 1, type: spill-slot, offset: -16, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x20' }
-  - { id: 2, type: spill-slot, offset: -24, size: 8, alignment: 8, stack-id: 0,
+  - { id: 2, type: spill-slot, offset: -24, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x21' }
-  - { id: 3, type: spill-slot, offset: -32, size: 8, alignment: 8, stack-id: 0,
+  - { id: 3, type: spill-slot, offset: -32, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x22' }
-  - { id: 4, type: spill-slot, offset: -40, size: 8, alignment: 8, stack-id: 0,
+  - { id: 4, type: spill-slot, offset: -40, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x23' }
-  - { id: 5, type: spill-slot, offset: -48, size: 8, alignment: 8, stack-id: 0,
+  - { id: 5, type: spill-slot, offset: -48, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x24' }
-  - { id: 6, type: spill-slot, offset: -56, size: 8, alignment: 8, stack-id: 0,
+  - { id: 6, type: spill-slot, offset: -56, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x25' }
-  - { id: 7, type: spill-slot, offset: -64, size: 8, alignment: 8, stack-id: 0,
+  - { id: 7, type: spill-slot, offset: -64, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x26' }
-  - { id: 8, type: spill-slot, offset: -72, size: 8, alignment: 8, stack-id: 0,
+  - { id: 8, type: spill-slot, offset: -72, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x27' }
-  - { id: 9, type: spill-slot, offset: -80, size: 8, alignment: 8, stack-id: 0,
+  - { id: 9, type: spill-slot, offset: -80, size: 8, alignment: 8, stack-id: default,
       callee-saved-register: '$x28' }
 body:             |
   bb.0.entry:
diff --git a/llvm/test/CodeGen/AArch64/wineh2.mir b/llvm/test/CodeGen/AArch64/wineh2.mir
index c8d9a0120de..9352181c473 100644
--- a/llvm/test/CodeGen/AArch64/wineh2.mir
+++ b/llvm/test/CodeGen/AArch64/wineh2.mir
@@ -75,49 +75,49 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x23', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x23', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x24', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x24', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -56, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x25', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x25', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -64, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x26', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x26', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -72, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x27', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x27', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 9, name: '', type: spill-slot, offset: -80, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x28', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x28', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 10, name: '', type: spill-slot, offset: -88, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d8', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d8', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 11, name: '', type: spill-slot, offset: -96, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d9', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d9', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 12, name: '', type: spill-slot, offset: -104, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d10', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d10', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 13, name: '', type: spill-slot, offset: -112, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d11', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d11', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 14, name: '', type: spill-slot, offset: -128, size: 8, alignment: 16,
-      stack-id: 0, callee-saved-register: '$d12', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d12', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh3.mir b/llvm/test/CodeGen/AArch64/wineh3.mir
index 395f8dac4d7..f2aea13d2a1 100644
--- a/llvm/test/CodeGen/AArch64/wineh3.mir
+++ b/llvm/test/CodeGen/AArch64/wineh3.mir
@@ -73,46 +73,46 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x23', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x23', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x24', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x24', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -56, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x25', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x25', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -64, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x26', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x26', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -72, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x27', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x27', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 9, name: '', type: spill-slot, offset: -80, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x28', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x28', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 10, name: '', type: spill-slot, offset: -88, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d8', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d8', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 11, name: '', type: spill-slot, offset: -96, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d9', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d9', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 12, name: '', type: spill-slot, offset: -104, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d10', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d10', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 13, name: '', type: spill-slot, offset: -112, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d11', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d11', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh4.mir b/llvm/test/CodeGen/AArch64/wineh4.mir
index 424e220873e..6f03a3816a7 100644
--- a/llvm/test/CodeGen/AArch64/wineh4.mir
+++ b/llvm/test/CodeGen/AArch64/wineh4.mir
@@ -86,46 +86,46 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x23', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x23', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x24', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x24', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -56, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x25', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x25', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -64, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x26', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x26', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -72, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x27', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x27', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 9, name: '', type: spill-slot, offset: -80, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x28', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x28', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 10, name: '', type: spill-slot, offset: -88, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d8', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d8', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 11, name: '', type: spill-slot, offset: -96, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d9', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d9', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 12, name: '', type: spill-slot, offset: -104, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d10', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d10', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 13, name: '', type: spill-slot, offset: -112, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d11', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d11', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh5.mir b/llvm/test/CodeGen/AArch64/wineh5.mir
index 3736377ceac..56b8d474ea9 100644
--- a/llvm/test/CodeGen/AArch64/wineh5.mir
+++ b/llvm/test/CodeGen/AArch64/wineh5.mir
@@ -120,39 +120,39 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: retval, type: default, offset: -36, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: i.addr, type: default, offset: -40, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -8, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 2, name: A, type: default, offset: -2992812, size: 2992772, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2992780, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 3, name: a, type: default, offset: -2992816, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2992784, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 4, name: B, type: default, offset: -2993308, size: 492, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -2993276, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -2993320, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -2993324, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$fp', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$fp', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 9, name: '', type: spill-slot, offset: -32, size: 8, alignment: 16,
-      stack-id: 0, callee-saved-register: '$x28', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x28', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh6.mir b/llvm/test/CodeGen/AArch64/wineh6.mir
index c14c75fa44e..12711ebdde9 100644
--- a/llvm/test/CodeGen/AArch64/wineh6.mir
+++ b/llvm/test/CodeGen/AArch64/wineh6.mir
@@ -65,37 +65,37 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: default, offset: -20, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: '', type: default, offset: -24, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -8, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 2, name: '', type: default, offset: -28, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -12, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 3, name: '', type: default, offset: -32, size: 4, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -16, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 4, name: '', type: default, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -24, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 5, name: '', type: variable-sized, offset: -40,
-      alignment: 1, stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      alignment: 1, stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -24, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$fp', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$fp', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh7.mir b/llvm/test/CodeGen/AArch64/wineh7.mir
index c82dd7df621..2d1b19a927c 100644
--- a/llvm/test/CodeGen/AArch64/wineh7.mir
+++ b/llvm/test/CodeGen/AArch64/wineh7.mir
@@ -70,26 +70,26 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: variable-sized, offset: -48,
-      alignment: 1, stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      alignment: 1, stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: 0, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$fp', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$fp', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$lr', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$lr', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh8.mir b/llvm/test/CodeGen/AArch64/wineh8.mir
index be1c6d2e370..018412aa97c 100644
--- a/llvm/test/CodeGen/AArch64/wineh8.mir
+++ b/llvm/test/CodeGen/AArch64/wineh8.mir
@@ -85,46 +85,46 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: '', type: spill-slot, offset: -8, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x19', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x19', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 1, name: '', type: spill-slot, offset: -16, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x20', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x20', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 2, name: '', type: spill-slot, offset: -24, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x21', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x21', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 3, name: '', type: spill-slot, offset: -32, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x22', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x22', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 4, name: '', type: spill-slot, offset: -40, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x23', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x23', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 5, name: '', type: spill-slot, offset: -48, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x24', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x24', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 6, name: '', type: spill-slot, offset: -56, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x25', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x25', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 7, name: '', type: spill-slot, offset: -64, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x26', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x26', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 8, name: '', type: spill-slot, offset: -72, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x27', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x27', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 9, name: '', type: spill-slot, offset: -80, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$x28', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$x28', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 10, name: '', type: spill-slot, offset: -88, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d8', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d8', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 11, name: '', type: spill-slot, offset: -96, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d9', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d9', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 12, name: '', type: spill-slot, offset: -104, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d10', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d10', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
   - { id: 13, name: '', type: spill-slot, offset: -112, size: 8, alignment: 8,
-      stack-id: 0, callee-saved-register: '$d11', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '$d11', callee-saved-restored: true,
       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 constants:
 body:             |
diff --git a/llvm/test/CodeGen/AArch64/wineh_shrinkwrap.mir b/llvm/test/CodeGen/AArch64/wineh_shrinkwrap.mir
index 97204722bc1..418e19ff1b6 100644
--- a/llvm/test/CodeGen/AArch64/wineh_shrinkwrap.mir
+++ b/llvm/test/CodeGen/AArch64/wineh_shrinkwrap.mir
@@ -107,7 +107,7 @@ frameInfo:
 fixedStack:
 stack:
   - { id: 0, name: A, type: default, offset: 0, size: 4000, alignment: 4,
-      stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
+      stack-id: default, callee-saved-register: '', callee-saved-restored: true,
       local-offset: -4000, debug-info-variable: '', debug-info-expression: '',
       debug-info-location: '' }
 constants: