Skip to content

Commit c5a19ef

Browse files
r-barnesfacebook-github-bot
authored andcommitted
Fix -Wbitwise-instead-of-logical in 5 files starting w/ fbpcs/emp_games/pcf2_attribution/AttributionRule_impl.h (#9310)
Summary: X-link: facebook/hhvm#9310 X-link: facebookincubator/dynolog#89 Pull Request resolved: #462 X-link: facebookresearch/fbpcs#2016 With LLVM-15, `&&` and `||` are required for boolean operands, rather than `&` and `|` which can be confused for bitwise operations. Fixing such ambiguity helps makes our code more readable. - If you approve of this diff, please use the "Accept & Ship" button :-) Differential Revision: D42347735 fbshipit-source-id: 44d51851a630d42e8bf9f6a72949399264384e8e
1 parent 7c0d5eb commit c5a19ef

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

fbpcf/engine/SecretShareEngine.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -749,13 +749,13 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares(
749749

750750
for (size_t i = 0; i < ands.size(); i++) {
751751
bool val = normalTuples.at(normalTupleIndex).getC() ^
752-
(openedSecrets.at(2 * normalTupleIndex) &
752+
(openedSecrets.at(2 * normalTupleIndex) &&
753753
normalTuples.at(normalTupleIndex).getB()) ^
754-
(openedSecrets.at(2 * normalTupleIndex + 1) &
754+
(openedSecrets.at(2 * normalTupleIndex + 1) &&
755755
normalTuples.at(normalTupleIndex).getA());
756756
if (myId_ == 0) {
757757
val = val ^
758-
(openedSecrets.at(2 * normalTupleIndex) &
758+
(openedSecrets.at(2 * normalTupleIndex) &&
759759
openedSecrets.at(2 * normalTupleIndex + 1));
760760
}
761761
andResults.push_back(val);
@@ -768,13 +768,13 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares(
768768
std::vector<bool> rst(batchSize);
769769
for (int j = 0; j < batchSize; j++) {
770770
bool val = normalTuples.at(normalTupleIndex).getC() ^
771-
(openedSecrets.at(2 * normalTupleIndex) &
771+
(openedSecrets.at(2 * normalTupleIndex) &&
772772
normalTuples.at(normalTupleIndex).getB()) ^
773-
(openedSecrets.at(2 * normalTupleIndex + 1) &
773+
(openedSecrets.at(2 * normalTupleIndex + 1) &&
774774
normalTuples.at(normalTupleIndex).getA());
775775
if (myId_ == 0) {
776776
val = val ^
777-
(openedSecrets.at(2 * normalTupleIndex) &
777+
(openedSecrets.at(2 * normalTupleIndex) &&
778778
openedSecrets.at(2 * normalTupleIndex + 1));
779779
}
780780
rst[j] = val;
@@ -829,7 +829,7 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares(
829829
(openedSecrets.at(secretIndex) && tuple.getA());
830830
if (myId_ == 0) {
831831
val = val ^
832-
(openedSecrets.at(leftSecretIndex) &
832+
(openedSecrets.at(leftSecretIndex) &&
833833
openedSecrets.at(secretIndex));
834834
}
835835
compositeResult[k][j] = val;

0 commit comments

Comments
 (0)