Skip to content

Commit 3be9e0b

Browse files
committed
[WebAssembly] Check bulk-memory when adjusting lang opts
We previously had logic to disable pthreads, set the ThreadModel to Single, and disable thread-safe statics when the atomics target features is disabled, since that means that the resulting program will not be used in a threaded context. Similarly check for the presence of the bulk-memory feature, since that is also necessary to produce multithreaded programs. Differential Revision: https://reviews.llvm.org/D121014
1 parent be57057 commit 3be9e0b

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

clang/lib/Basic/Targets/WebAssembly.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,10 @@ ArrayRef<Builtin::Info> WebAssemblyTargetInfo::getTargetBuiltins() const {
256256
void WebAssemblyTargetInfo::adjust(DiagnosticsEngine &Diags,
257257
LangOptions &Opts) {
258258
TargetInfo::adjust(Diags, Opts);
259-
// If the Atomics feature isn't available, turn off POSIXThreads and
260-
// ThreadModel, so that we don't predefine _REENTRANT or __STDCPP_THREADS__.
261-
if (!HasAtomics) {
259+
// Turn off POSIXThreads and ThreadModel so that we don't predefine _REENTRANT
260+
// or __STDCPP_THREADS__ if we will eventually end up stripping atomics
261+
// because they are unsupported.
262+
if (!HasAtomics || !HasBulkMemory) {
262263
Opts.POSIXThreads = false;
263264
Opts.setThreadModel(LangOptions::ThreadModelKind::Single);
264265
Opts.ThreadsafeStatics = false;

clang/test/CodeGenCXX/static-init-wasm.cpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %clang_cc1 -emit-llvm -triple=wasm32-unknown-unknown -target-feature +atomics -o - %s \
1+
// RUN: %clang_cc1 -emit-llvm -triple=wasm32-unknown-unknown -target-feature +atomics -target-feature +bulk-memory -o - %s \
22
// RUN: | FileCheck %s -check-prefix=WEBASSEMBLY32
3-
// RUN: %clang_cc1 -emit-llvm -triple=wasm64-unknown-unknown -target-feature +atomics -o - %s \
3+
// RUN: %clang_cc1 -emit-llvm -triple=wasm64-unknown-unknown -target-feature +atomics -target-feature +bulk-memory -o - %s \
44
// RUN: | FileCheck %s -check-prefix=WEBASSEMBLY64
55

66
// Test that we don't create common blocks.
@@ -53,9 +53,9 @@ A theA;
5353
// WEBASSEMBLY64: define internal void @_GLOBAL__sub_I_static_init_wasm.cpp() #3 {
5454
// WEBASSEMBLY64: call void @__cxx_global_var_init()
5555

56-
// RUN: %clang_cc1 -emit-llvm -triple=wasm32-unknown-unknown -o - %s \
56+
// RUN: %clang_cc1 -emit-llvm -triple=wasm32-unknown-unknown -target-feature +bulk-memory -o - %s \
5757
// RUN: | FileCheck %s -check-prefix=NOATOMICS
58-
// RUN: %clang_cc1 -emit-llvm -triple=wasm64-unknown-unknown -o - %s \
58+
// RUN: %clang_cc1 -emit-llvm -triple=wasm64-unknown-unknown -target-feature +bulk-memory -o - %s \
5959
// RUN: | FileCheck %s -check-prefix=NOATOMICS
6060

6161
// NOATOMICS-LABEL: @_Z1gv()
@@ -66,3 +66,17 @@ A theA;
6666
// NOATOMICS-NOT: __cxa_guard_acquire
6767
// NOATOMICS: [[END]]:
6868
// NOATOMICS-NEXT: ret void
69+
70+
// RUN: %clang_cc1 -emit-llvm -triple=wasm32-unknown-unknown -target-feature +atomics -o - %s \
71+
// RUN: | FileCheck %s -check-prefix=NOBULKMEM
72+
// RUN: %clang_cc1 -emit-llvm -triple=wasm64-unknown-unknown -target-feature +atomics -o - %s \
73+
// RUN: | FileCheck %s -check-prefix=NOBULKMEM
74+
75+
// NOBULKMEM-LABEL: @_Z1gv()
76+
// NOBULKMEM: %[[R0:.+]] = load i8, i8* @_ZGVZ1gvE1a, align 1
77+
// NOBULKMEM-NEXT: %guard.uninitialized = icmp eq i8 %[[R0]], 0
78+
// NOBULKMEM-NEXT: br i1 %guard.uninitialized, label %[[CHECK:.+]], label %[[END:.+]],
79+
// NOBULKMEM: [[CHECK]]:
80+
// NOBULKMEM-NOT: __cxa_guard_acquire
81+
// NOBULKMEM: [[END]]:
82+
// NOBULKMEM-NEXT: ret void

0 commit comments

Comments
 (0)