Skip to content

Commit c9d028d

Browse files
Thomas Symallatsymalla-AMD
authored andcommitted
Fix MSVC build.
The recent changes to OpDescription to handle different LLVM versions cause a UB warning on MSVC: C5101: use of preprocessor directive in function-like macro argument list is undefined behavior
1 parent f00b575 commit c9d028d

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

lib/Dialect/OpDescription.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,23 @@ HANDLE_INTRINSIC_DESC_OPCODE_SET(LifetimeIntrinsic, Intrinsic::lifetime_start,
152152
#endif
153153

154154
// Add Intrinsic::dbg_addr back for sufficiently recent LLVM
155-
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgInfoIntrinsic, Intrinsic::dbg_declare,
156-
Intrinsic::dbg_value, Intrinsic::dbg_label
157155
#if HAVE_LLVM_VERSION_MAJOR >= 16
158-
,Intrinsic::dbg_assign
156+
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgInfoIntrinsic, Intrinsic::dbg_declare,
157+
Intrinsic::dbg_value, Intrinsic::dbg_label,
158+
Intrinsic::dbg_assign)
159+
#else
160+
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgInfoIntrinsic, Intrinsic::dbg_declare,
161+
Intrinsic::dbg_value, Intrinsic::dbg_label)
159162
#endif
160-
)
161163

162164
// Add Intrinsic::dbg_addr back for sufficiently recent LLVM
163-
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgVariableIntrinsic, Intrinsic::dbg_declare,
164-
Intrinsic::dbg_value
165165
#if HAVE_LLVM_VERSION_MAJOR >= 16
166-
,Intrinsic::dbg_assign
166+
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgVariableIntrinsic, Intrinsic::dbg_declare,
167+
Intrinsic::dbg_value, Intrinsic::dbg_assign)
168+
#else
169+
HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgVariableIntrinsic, Intrinsic::dbg_declare,
170+
Intrinsic::dbg_value)
167171
#endif
168-
)
169172

170173
HANDLE_INTRINSIC_DESC(DbgDeclareInst, dbg_declare)
171174
HANDLE_INTRINSIC_DESC(DbgValueInst, dbg_value)

0 commit comments

Comments
 (0)