From e06539456ca3daee8e6741d0901e72a29d8e28b8 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Fri, 27 Apr 2018 00:32:24 +0000 Subject: [PATCH] [LowerTypeTests] Mark .cfi.jumptable nounwind. It doesn't unwind, and the wrong marking leads to the creation of an .eh_frame section when it isn't necessary. Differential Revision: https://reviews.llvm.org/D46082 llvm-svn: 331008 --- llvm/lib/Transforms/IPO/LowerTypeTests.cpp | 2 ++ .../test/Transforms/LowerTypeTests/function-arm-thumb.ll | 4 ++-- llvm/test/Transforms/LowerTypeTests/function.ll | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp index 925d8f87b3f9..1e17d13faec9 100644 --- a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp +++ b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp @@ -1290,6 +1290,8 @@ void LowerTypeTestsModule::createJumpTable( // by Clang for -march=armv7. F->addFnAttr("target-cpu", "cortex-a8"); } + // Make sure we don't emit .eh_frame for this function. + F->addFnAttr(Attribute::NoUnwind); BasicBlock *BB = BasicBlock::Create(M.getContext(), "entry", F); IRBuilder<> IRB(BB); diff --git a/llvm/test/Transforms/LowerTypeTests/function-arm-thumb.ll b/llvm/test/Transforms/LowerTypeTests/function-arm-thumb.ll index 3223e67ded37..b8f7d08a1dac 100644 --- a/llvm/test/Transforms/LowerTypeTests/function-arm-thumb.ll +++ b/llvm/test/Transforms/LowerTypeTests/function-arm-thumb.ll @@ -37,5 +37,5 @@ define void @h2() "target-features"="-thumb-mode" !type !1 { ; CHECK-NEXT: unreachable ; CHECK-NEXT: } -; CHECK-DAG: attributes #[[AA]] = { naked "target-features"="-thumb-mode" } -; CHECK-DAG: attributes #[[AT]] = { naked "target-cpu"="cortex-a8" "target-features"="+thumb-mode" } +; CHECK-DAG: attributes #[[AA]] = { naked nounwind "target-features"="-thumb-mode" } +; CHECK-DAG: attributes #[[AT]] = { naked nounwind "target-cpu"="cortex-a8" "target-features"="+thumb-mode" } diff --git a/llvm/test/Transforms/LowerTypeTests/function.ll b/llvm/test/Transforms/LowerTypeTests/function.ll index 759041fea6f1..de984dfebd86 100644 --- a/llvm/test/Transforms/LowerTypeTests/function.ll +++ b/llvm/test/Transforms/LowerTypeTests/function.ll @@ -49,7 +49,7 @@ define i1 @foo(i8* %p) { } ; X86-LINUX: define private void @[[JT]]() #[[ATTR:.*]] section ".text.cfi" align 8 { -; X86-WIN32: define private void @[[JT]]() section ".text.cfi" align 8 { +; X86-WIN32: define private void @[[JT]]() #[[ATTR:.*]] section ".text.cfi" align 8 { ; ARM: define private void @[[JT]]() #[[ATTR:.*]] section ".text.cfi" align 4 { ; THUMB: define private void @[[JT]]() #[[ATTR:.*]] section ".text.cfi" align 4 { @@ -70,9 +70,10 @@ define i1 @foo(i8* %p) { ; NATIVE-SAME: "s,s"(void ()* @f.cfi, void ()* @g.cfi) -; X86-LINUX: attributes #[[ATTR]] = { {{.*}}naked -; ARM: attributes #[[ATTR]] = { {{.*}}naked -; THUMB: attributes #[[ATTR]] = { {{.*}}naked{{.*}}"target-cpu"="cortex-a8" +; X86-LINUX: attributes #[[ATTR]] = { naked nounwind } +; X86-WIN32: attributes #[[ATTR]] = { nounwind } +; ARM: attributes #[[ATTR]] = { naked nounwind +; THUMB: attributes #[[ATTR]] = { naked nounwind "target-cpu"="cortex-a8" "target-features"="+thumb-mode" } ; WASM32: ![[I0]] = !{i64 1} ; WASM32: ![[I1]] = !{i64 2}