Skip to content

Commit d99e734

Browse files
committed
Address the review comments
1 parent cc26694 commit d99e734

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

clang/lib/Headers/hlsl/hlsl_intrinsics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ bool4 and(bool4 x, bool4 y);
298298
/// \brief Returns the bitwise OR of the two input values, \a x and \a y.
299299
/// \param x The first input value and y The second input value.
300300
///
301-
/// \returns The logically OR a vector and retuens bool vector.
302-
301+
/// \returns A boolean vector by performing a logical OR operation elementwise.
303302
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_or)
304303
bool or(bool, bool);
305304
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_or)
@@ -308,6 +307,7 @@ _HLSL_BUILTIN_ALIAS(__builtin_hlsl_or)
308307
bool3 or(bool3, bool3);
309308
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_or)
310309
bool4 or(bool4, bool4);
310+
311311
//===----------------------------------------------------------------------===//
312312
// any builtins
313313
//===----------------------------------------------------------------------===//

clang/test/CodeGenHLSL/builtins/or.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ bool4 test_or_int4(int4 x, int4 y)
8282
bool4 test_or_float4(float4 x, float4 y)
8383
{
8484
return or(x, y);
85-
}
85+
}

clang/test/SemaHLSL/BuiltIns/logical-operator-errors.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ bool test_incorrect_type(int a)
2424
{
2525
return TEST_FUNC(a, a);
2626
// expected-error@-1{{invalid operand of type 'int' where 'bool' or a vector of such type is required}}
27-
}
27+
}

0 commit comments

Comments
 (0)