[AArch64] Default to SEH exception handling on MinGW

mstorsjo · mstorsjo · commit ae58e02d3942 · 2019-05-06T21:18:15.000Z
The SEH implementation is pretty mature at this point. Differential Revision: https://reviews.llvm.org/D61590 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360080 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp b/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
@@ -130,8 +130,6 @@ AArch64MCAsmInfoGNUCOFF::AArch64MCAsmInfoGNUCOFF() {
   CodePointerSize = 8;
 
   CommentString = "//";
-  ExceptionsType = ExceptionHandling::DwarfCFI;
-  // The default is dwarf, but WinEH can be enabled optionally, which requires
-  // WinEHEncodingType to be set.
+  ExceptionsType = ExceptionHandling::WinEH;
   WinEHEncodingType = WinEH::EncodingType::Itanium;
 }
diff --git a/test/CodeGen/AArch64/dwarf-cfi.ll b/test/CodeGen/AArch64/dwarf-cfi.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple aarch64-windows-gnu -filetype=asm -o - %s | FileCheck %s
+; RUN: llc -mtriple aarch64-windows-gnu -exception-model=dwarf -filetype=asm -o - %s | FileCheck %s
 
 define void @_Z1gv() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
diff --git a/test/CodeGen/AArch64/wineh-mingw.ll b/test/CodeGen/AArch64/wineh-mingw.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -exception-model=wineh -mtriple=aarch64-pc-mingw32 | FileCheck %s -check-prefix=WINEH
-; RUN: llc < %s -exception-model=wineh -mtriple=aarch64-pc-mingw32 -filetype=obj | llvm-readobj -S | FileCheck %s -check-prefix=WINEH-SECTIONS
+; RUN: llc < %s -mtriple=aarch64-pc-mingw32 | FileCheck %s -check-prefix=WINEH
+; RUN: llc < %s -mtriple=aarch64-pc-mingw32 -filetype=obj | llvm-readobj -S | FileCheck %s -check-prefix=WINEH-SECTIONS
 
 ; Check emission of eh handler and handler data
 declare i32 @_d_eh_personality(i32, i32, i64, i8*, i8*)

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,6 @@ AArch64MCAsmInfoGNUCOFF::AArch64MCAsmInfoGNUCOFF() {`
`130`	`130`	`CodePointerSize = 8;`
`131`	`131`
`132`	`132`	`CommentString = "//";`
`133`		`- ExceptionsType = ExceptionHandling::DwarfCFI;`
`134`		`- // The default is dwarf, but WinEH can be enabled optionally, which requires`
`135`		`- // WinEHEncodingType to be set.`
	`133`	`+ ExceptionsType = ExceptionHandling::WinEH;`
`136`	`134`	`WinEHEncodingType = WinEH::EncodingType::Itanium;`
`137`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; RUN: llc -mtriple aarch64-windows-gnu -filetype=asm -o - %s \| FileCheck %s`
	`1`	`+; RUN: llc -mtriple aarch64-windows-gnu -exception-model=dwarf -filetype=asm -o - %s \| FileCheck %s`
`2`	`2`
`3`	`3`	`define void @_Z1gv() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {`
`4`	`4`	`entry:`