Skip to content

Commit d6a4586

Browse files
committed
[NFC][clang] Fix merge conflict artefact: unclosed ifdef
1 parent c9d3e83 commit d6a4586

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

clang/test/CodeGen/builtins-nvptx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,6 +4254,7 @@ __device__ void nvvm_atom(float *fp, float f, double *dfp, double df,
42544254
// CHECK_SM70_LP64: call i64 @llvm.nvvm.atomic.cas.shared.i.acq.rel.cta.i64.p3
42554255
// expected-error@+1 {{'__nvvm_atom_acq_rel_cta_cas_shared_l' needs target feature sm_70}}
42564256
__nvvm_atom_acq_rel_cta_cas_shared_l((__attribute__((address_space(3))) long *)&dl, l, 0);
4257+
#endif
42574258

42584259
#if __CUDA_ARCH__ >= 700
42594260
// CHECK_PTX63_SM70: cmpxchg ptr {{.*}} seq_cst seq_cst, align 2

0 commit comments

Comments
 (0)