RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 05:41:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: make sure backend is consistent about exception handling method.

Browse Source 
It turns out we decide whether to use SjLj exceptions or some alternative in
two separate places in the backend, and they disagreed with each other. This
led to inconsistent code and is generally a terrible idea.

So make them consistent and add an assert that they *do* match (unfortunately
MCAsmInfo isn't available in opt, so it can't be used to initialise the CodeGen
version directly).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253502 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tim Northover 2015-11-18 21:10:39 +00:00
parent 54225a9153
commit c931f35508
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Target/ARM/ARMSubtarget.cpp
View File

@ -26,6 +26,7 @@
#include "llvm/IR/Attributes.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetOptions.h"
@ -151,8 +152,15 @@ void ARMSubtarget::initializeEnvironment() {
UseNaClTrap = false;
GenLongCalls = false;
UnsafeFPMath = false;
UseSjLjEH = (isTargetDarwin() &&
TargetTriple.getSubArch() != Triple::ARMSubArch_v7k);
// MCAsmInfo isn't always present (e.g. in opt) so we can't initialize this
// directly from it, but we can try to make sure they're consistent when both
// available.
UseSjLjEH = isTargetDarwin() && !isTargetWatchOS();
assert((!TM.getMCAsmInfo() ||
(TM.getMCAsmInfo()->getExceptionHandlingType() ==
ExceptionHandling::SjLj) == UseSjLjEH) &&
"inconsistent sjlj choice between CodeGen and MC");
}
void ARMSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {

5
lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
View File

@ -33,8 +33,9 @@ ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin(const Triple &TheTriple) {
SupportsDebugInformation = true;
// Exceptions handling
ExceptionsType = TheTriple.isWatchOS() ? ExceptionHandling::DwarfCFI
: ExceptionHandling::SjLj;
ExceptionsType = TheTriple.isOSDarwin() && !TheTriple.isWatchOS()
? ExceptionHandling::SjLj
: ExceptionHandling::DwarfCFI;
UseIntegratedAssembler = true;
}

1
test/CodeGen/ARM/eh-resume-darwin.ll
View File

@ -1,4 +1,5 @@
; RUN: llc < %s -mtriple=armv7-apple-ios -arm-atomic-cfg-tidy=0 | FileCheck %s -check-prefix=IOS
; RUN: llc < %s -mtriple=armv7k-apple-ios -arm-atomic-cfg-tidy=0 | FileCheck %s -check-prefix=IOS
; RUN: llc < %s -mtriple=armv7k-apple-watchos -arm-atomic-cfg-tidy=0 | FileCheck %s -check-prefix=WATCHOS
declare void @func()

1
test/CodeGen/ARM/sjljehprepare-lower-empty-struct.ll
View File

@ -2,6 +2,7 @@
; RUN: llc -mtriple=armv7-apple-ios -O1 < %s | FileCheck %s
; RUN: llc -mtriple=armv7-apple-ios -O2 < %s | FileCheck %s
; RUN: llc -mtriple=armv7-apple-ios -O3 < %s | FileCheck %s
; RUN: llc -mtriple=armv7k-apple-ios < %s | FileCheck %s
; SjLjEHPrepare shouldn't crash when lowering empty structs.
;

4
test/CodeGen/Thumb/thumb-shrink-wrapping.ll
View File

@ -22,7 +22,7 @@
;
; Prologue code.
; CHECK: push {r7, lr}
; CHECK-NEXT: sub sp, #8
; CHECK: sub sp, #8
;
; Compare the arguments and jump to exit.
; After the prologue is set.
@ -418,7 +418,7 @@ if.end: ; preds = %for.body, %if.else
;
; Prologue code.
; CHECK: push {[[TMP:r[0-9]+]], lr}
; CHECK-NEXT: sub sp, #16
; CHECK: sub sp, #16
;
; DISABLE: cmp r0, #0
; DISABLE-NEXT: beq [[ELSE_LABEL:LBB[0-9_]+]]