Skip to content

Commit 26d5485

Browse files
committed
Trying to fix the CI crashes
1 parent 4b51b6c commit 26d5485

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

clang/lib/AST/ByteCode/InterpBuiltin.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3798,8 +3798,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
37983798
case clang::X86::BI__builtin_ia32_ktestcdi:
37993799
return interp__builtin_elementwise_int_binop(
38003800
S, OpPC, Call, [](const APSInt &A, const APSInt &B) {
3801-
return APInt(sizeof(unsigned char) * 8,
3802-
(unsigned char)((~A & B) == 0));
3801+
return APInt(sizeof(unsigned char) * 8, (~A & B) == 0);
38033802
});
38043803

38053804
case clang::X86::BI__builtin_ia32_ktestzqi:
@@ -3808,8 +3807,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
38083807
case clang::X86::BI__builtin_ia32_ktestzdi:
38093808
return interp__builtin_elementwise_int_binop(
38103809
S, OpPC, Call, [](const APSInt &A, const APSInt &B) {
3811-
return APInt(sizeof(unsigned char) * 8,
3812-
(unsigned char)((A & B) == 0));
3810+
return APInt(sizeof(unsigned char) * 8, (A & B) == 0);
38133811
});
38143812

38153813
case clang::X86::BI__builtin_ia32_kortestcqi:
@@ -3818,8 +3816,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
38183816
case clang::X86::BI__builtin_ia32_kortestcdi:
38193817
return interp__builtin_elementwise_int_binop(
38203818
S, OpPC, Call, [](const APSInt &A, const APSInt &B) {
3821-
return APInt(sizeof(unsigned char) * 8,
3822-
(unsigned char)(~(A | B) == 0));
3819+
return APInt(sizeof(unsigned char) * 8, ~(A | B) == 0);
38233820
});
38243821

38253822
case clang::X86::BI__builtin_ia32_kortestzqi:
@@ -3828,8 +3825,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
38283825
case clang::X86::BI__builtin_ia32_kortestzdi:
38293826
return interp__builtin_elementwise_int_binop(
38303827
S, OpPC, Call, [](const APSInt &A, const APSInt &B) {
3831-
return APInt(sizeof(unsigned char) * 8,
3832-
(unsigned char)((A | B) == 0));
3828+
return APInt(sizeof(unsigned char) * 8, (A | B) == 0);
38333829
});
38343830

38353831
case clang::X86::BI__builtin_ia32_lzcnt_u16:

clang/lib/AST/ExprConstant.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15623,8 +15623,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1562315623
!EvaluateInteger(E->getArg(1), B, Info))
1562415624
return false;
1562515625

15626-
return Success(
15627-
APInt(sizeof(unsigned char) * 8, (unsigned char)((~A & B) == 0)), E);
15626+
return Success((~A & B) == 0, E);
1562815627
}
1562915628

1563015629
case clang::X86::BI__builtin_ia32_ktestzqi:
@@ -15636,8 +15635,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1563615635
!EvaluateInteger(E->getArg(1), B, Info))
1563715636
return false;
1563815637

15639-
return Success(
15640-
APInt(sizeof(unsigned char) * 8, (unsigned char)((A & B) == 0)), E);
15638+
return Success((A & B) == 0, E);
1564115639
}
1564215640

1564315641
case clang::X86::BI__builtin_ia32_kortestcqi:
@@ -15649,8 +15647,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1564915647
!EvaluateInteger(E->getArg(1), B, Info))
1565015648
return false;
1565115649

15652-
return Success(
15653-
APInt(sizeof(unsigned char) * 8, (unsigned char)(~(A | B) == 0)), E);
15650+
return Success(~(A | B) == 0, E);
1565415651
}
1565515652

1565615653
case clang::X86::BI__builtin_ia32_kortestzqi:
@@ -15662,8 +15659,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
1566215659
!EvaluateInteger(E->getArg(1), B, Info))
1566315660
return false;
1566415661

15665-
return Success(
15666-
APInt(sizeof(unsigned char) * 8, (unsigned char)((A | B) == 0)), E);
15662+
return Success((A | B) == 0, E);
1566715663
}
1566815664

1566915665
case clang::X86::BI__builtin_ia32_lzcnt_u16:

0 commit comments

Comments
 (0)