[llvm] b646e8b - [lld][WebAssembly] Add test for TLS BSS data. NFC.

[Sam Clegg via llvm-commits]

Author: Sam Clegg
Date: 2020-11-13T07:52:18-08:00
New Revision: b646e8b1549275e94ef6de446bedd865029453f9

URL: https://github.com/llvm/llvm-project/commit/b646e8b1549275e94ef6de446bedd865029453f9
DIFF: https://github.com/llvm/llvm-project/commit/b646e8b1549275e94ef6de446bedd865029453f9.diff

LOG: [lld][WebAssembly] Add test for TLS BSS data. NFC.

Differential Revision: https://reviews.llvm.org/D91231

Added: 
    

Modified: 
    lld/test/wasm/tls.s
    llvm/lib/MC/MCParser/WasmAsmParser.cpp

Removed: 
    


################################################################################
diff  --git a/lld/test/wasm/tls.s b/lld/test/wasm/tls.s
index d794cc9a0925..0f6d42e65ac2 100644
--- a/lld/test/wasm/tls.s
+++ b/lld/test/wasm/tls.s
@@ -19,6 +19,14 @@ tls2_addr:
   i32.add
   end_function
 
+.globl tls3_addr
+tls3_addr:
+  .functype tls3_addr () -> (i32)
+  global.get __tls_base
+  i32.const tls3
+  i32.add
+  end_function
+
 .globl tls_align
 tls_align:
   .functype tls_align () -> (i32)
@@ -46,6 +54,13 @@ tls2:
   .int32  1
   .size tls2, 4
 
+.section  .tbss.tls3,"",@
+.globl  tls3
+.p2align  2
+tls3:
+  .int32  0
+  .size tls3, 4
+
 .section  .custom_section.target_features,"",@
   .int8 2
   .int8 43
@@ -68,7 +83,7 @@ tls2:
 # CHECK-NEXT:       Mutable:         true
 # CHECK-NEXT:       InitExpr:
 # CHECK-NEXT:         Opcode:          I32_CONST
-# CHECK-NEXT:         Value:           66576
+# CHECK-NEXT:         Value:           66592
 
 # __tls_base
 # CHECK-NEXT:     - Index:           1
@@ -84,7 +99,7 @@ tls2:
 # CHECK-NEXT:       Mutable:         false
 # CHECK-NEXT:       InitExpr:
 # CHECK-NEXT:         Opcode:          I32_CONST
-# CHECK-NEXT:         Value:           8
+# CHECK-NEXT:         Value:           12
 
 # __tls_align
 # CHECK-NEXT:     - Index:           3
@@ -100,14 +115,14 @@ tls2:
 # Skip __wasm_call_ctors and __wasm_init_memory
 # CHECK:          - Index:           2
 # CHECK-NEXT:       Locals:          []
-# CHECK-NEXT:       Body:            20002401200041004108FC0800000B
+# CHECK-NEXT:       Body:            2000240120004100410CFC0800000B
 
 # Expected body of __wasm_init_tls:
 #   local.get 0
 #   global.set  1
 #   local.get 0
 #   i32.const 0
-#   i32.const 8
+#   i32.const 12
 #   memory.init 1, 0
 #   end
 
@@ -125,7 +140,7 @@ tls2:
 # CHECK-NEXT:       Locals:          []
 # CHECK-NEXT:       Body:            2381808080004184808080006A0B
 
-# Expected body of tls1_addr:
+# Expected body of tls2_addr:
 #   global.get 1
 #   i32.const 4
 #   i32.add
@@ -133,8 +148,18 @@ tls2:
 
 # CHECK-NEXT:     - Index:           5
 # CHECK-NEXT:       Locals:          []
+# CHECK-NEXT:       Body:            2381808080004188808080006A0B
+
+# Expected body of tls3_addr:
+#   global.get 1
+#   i32.const 4
+#   i32.add
+#   end
+
+# CHECK-NEXT:     - Index:           6
+# CHECK-NEXT:       Locals:          []
 # CHECK-NEXT:       Body:            2383808080000B
 
-# Expected body of tls1_addr:
+# Expected body of tls_align:
 #   global.get 3
 #   end

diff  --git a/llvm/lib/MC/MCParser/WasmAsmParser.cpp b/llvm/lib/MC/MCParser/WasmAsmParser.cpp
index 4bb39d5d824b..c8f9807d0c54 100644
--- a/llvm/lib/MC/MCParser/WasmAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/WasmAsmParser.cpp
@@ -117,6 +117,7 @@ class WasmAsmParser : public MCAsmParserExtension {
     auto Kind = StringSwitch<Optional<SectionKind>>(Name)
                     .StartsWith(".data", SectionKind::getData())
                     .StartsWith(".tdata", SectionKind::getThreadData())
+                    .StartsWith(".tbss", SectionKind::getThreadBSS())
                     .StartsWith(".rodata", SectionKind::getReadOnly())
                     .StartsWith(".text", SectionKind::getText())
                     .StartsWith(".custom_section", SectionKind::getMetadata())