Revert "AArch64: take compact unwind frame size from last CFI instruction."

TNorthover · TNorthover · commit 901831a4e615 · 2022-04-11T12:25:58.000+01:00
It was on ToT when I pushed and committed unintentionally.
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
@@ -621,6 +621,8 @@ class DarwinAArch64AsmBackend : public AArch64AsmBackend {
         break;
       }
       case MCCFIInstruction::OpDefCfaOffset: {
+        if (StackSize != 0)
+          return CU::UNWIND_ARM64_MODE_DWARF;
         StackSize = std::abs(Inst.getOffset());
         break;
       }
diff --git a/llvm/test/CodeGen/AArch64/compact-unwind-async.ll b/llvm/test/CodeGen/AArch64/compact-unwind-async.ll
diff --git a/llvm/test/MC/AArch64/arm64-compact-unwind-fallback.s b/llvm/test/MC/AArch64/arm64-compact-unwind-fallback.s
@@ -5,11 +5,21 @@
 
 // CHECK: Contents of __compact_unwind section:
 // CHECK: compact encoding:     0x03000000
+// CHECK: compact encoding:     0x03000000
 
 // CHECK: .eh_frame contents:
 // CHECK: DW_CFA_def_cfa: reg1 +32
 
+//  DW_CFA_def_cfa_offset: +32
+//  DW_CFA_def_cfa_offset: +64
+
 _cfi_dwarf0:
  .cfi_startproc
  .cfi_def_cfa x1, 32;
  .cfi_endproc
+
+_cfi_dwarf1:
+ .cfi_startproc
+ .cfi_def_cfa_offset 32
+ .cfi_def_cfa_offset 64
+ .cfi_endproc

Original file line number	Diff line number	Diff line change
`@@ -621,6 +621,8 @@ class DarwinAArch64AsmBackend : public AArch64AsmBackend {`
`621`	`621`	`break;`
`622`	`622`	`}`
`623`	`623`	`case MCCFIInstruction::OpDefCfaOffset: {`
	`624`	`+ if (StackSize != 0)`
	`625`	`+ return CU::UNWIND_ARM64_MODE_DWARF;`
`624`	`626`	`StackSize = std::abs(Inst.getOffset());`
`625`	`627`	`break;`
`626`	`628`	`}`