[PATCH] D46082: [LowerTypeTests] Mark .cfi.jumptable nounwind.

[Eli Friedman via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL331008: [LowerTypeTests] Mark .cfi.jumptable nounwind. (authored by efriedma, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D46082?vs=144001&id=144255#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D46082

Files:
  llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
  llvm/trunk/test/Transforms/LowerTypeTests/function-arm-thumb.ll
  llvm/trunk/test/Transforms/LowerTypeTests/function.ll


Index: llvm/trunk/test/Transforms/LowerTypeTests/function-arm-thumb.ll
===================================================================
--- llvm/trunk/test/Transforms/LowerTypeTests/function-arm-thumb.ll
+++ llvm/trunk/test/Transforms/LowerTypeTests/function-arm-thumb.ll
@@ -37,5 +37,5 @@
 ; 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" }
Index: llvm/trunk/test/Transforms/LowerTypeTests/function.ll
===================================================================
--- llvm/trunk/test/Transforms/LowerTypeTests/function.ll
+++ llvm/trunk/test/Transforms/LowerTypeTests/function.ll
@@ -49,7 +49,7 @@
 }
 
 ; 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 @@
 
 ; 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}
Index: llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
===================================================================
--- llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
+++ llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
@@ -1290,6 +1290,8 @@
     // 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);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46082.144255.patch
Type: text/x-patch
Size: 2512 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180427/c8e0848e/attachment.bin>