[PATCH] D29315: MCMacho: Allow __thread_ptr section after dwarf sections

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL293730: MCMacho: Allow __thread_ptr section after dwarf sections (authored by matze).

Changed prior to commit:
  https://reviews.llvm.org/D29315?vs=86382&id=86531#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D29315

Files:
  llvm/trunk/lib/MC/MCMachOStreamer.cpp
  llvm/trunk/test/MC/MachO/ARM/no-tls-assert.ll


Index: llvm/trunk/lib/MC/MCMachOStreamer.cpp
===================================================================
--- llvm/trunk/lib/MC/MCMachOStreamer.cpp
+++ llvm/trunk/lib/MC/MCMachOStreamer.cpp
@@ -142,7 +142,8 @@
   if (SegName == "__TEXT" && SecName == "__eh_frame")
     return true;
 
-  if (SegName == "__DATA" && SecName == "__nl_symbol_ptr")
+  if (SegName == "__DATA" && (SecName == "__nl_symbol_ptr" ||
+                              SecName == "__thread_ptr"))
     return true;
 
   return false;
Index: llvm/trunk/test/MC/MachO/ARM/no-tls-assert.ll
===================================================================
--- llvm/trunk/test/MC/MachO/ARM/no-tls-assert.ll
+++ llvm/trunk/test/MC/MachO/ARM/no-tls-assert.ll
@@ -0,0 +1,28 @@
+; RUN: llc -filetype=obj -o - %s | llvm-objdump -section-headers - | FileCheck %s
+; This should not trigger the "Creating regular section after DWARF" assert.
+; CHECK: __text
+; CHECK: __thread_ptr  00000004
+target triple = "thumbv7-apple-ios9.0.0"
+
+ at b = external thread_local global i32
+define i32* @func(i32 %a) !dbg !9 {
+  ret i32* @b
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5, !6, !7}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
+!1 = !DIFile(filename: "r.ii", directory: "/")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{i32 1, !"min_enum_size", i32 4}
+!7 = !{i32 1, !"PIC Level", i32 2}
+!9 = distinct !DISubprogram(name: "func", scope: !1, file: !1, line: 4, type: !10, isLocal: false, isDefinition: true, scopeLine: 4, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2)
+!10 = !DISubroutineType(types: !11)
+!11 = !{null, !12}
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !DILocalVariable(name: "a", arg: 1, scope: !9, file: !1, line: 4, type: !12)
+!14 = !DIExpression()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29315.86531.patch
Type: text/x-patch
Size: 1987 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170201/84c3ee38/attachment.bin>