From c4df9a4ce6628d070bc2809f24ad909139027efd Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Fri, 6 Jan 2023 16:55:21 -0800 Subject: [PATCH] Fix '-Wbitwise-instead-of-logical' in fbpcf/engine/SecretShareEngine.cpp Summary: LLVM-15 requires that we differentiate between `&&` and `&` as well as `||` and `|`. Logical operations are done with `&&` and `||` and bitwise operations are done with `&` and `|`. Confusing the two makes code harder to read and may lead to subtle bugs. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: dmm-fb Differential Revision: D42374505 fbshipit-source-id: 7d4a3d7a70b0acf5603ece36b53ea556d695303f --- fbpcf/engine/SecretShareEngine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fbpcf/engine/SecretShareEngine.cpp b/fbpcf/engine/SecretShareEngine.cpp index aefd0b09..a1cdf779 100644 --- a/fbpcf/engine/SecretShareEngine.cpp +++ b/fbpcf/engine/SecretShareEngine.cpp @@ -749,13 +749,13 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares( for (size_t i = 0; i < ands.size(); i++) { bool val = normalTuples.at(normalTupleIndex).getC() ^ - (openedSecrets.at(2 * normalTupleIndex) & + (openedSecrets.at(2 * normalTupleIndex) && normalTuples.at(normalTupleIndex).getB()) ^ - (openedSecrets.at(2 * normalTupleIndex + 1) & + (openedSecrets.at(2 * normalTupleIndex + 1) && normalTuples.at(normalTupleIndex).getA()); if (myId_ == 0) { val = val ^ - (openedSecrets.at(2 * normalTupleIndex) & + (openedSecrets.at(2 * normalTupleIndex) && openedSecrets.at(2 * normalTupleIndex + 1)); } andResults.push_back(val); @@ -768,13 +768,13 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares( std::vector rst(batchSize); for (int j = 0; j < batchSize; j++) { bool val = normalTuples.at(normalTupleIndex).getC() ^ - (openedSecrets.at(2 * normalTupleIndex) & + (openedSecrets.at(2 * normalTupleIndex) && normalTuples.at(normalTupleIndex).getB()) ^ - (openedSecrets.at(2 * normalTupleIndex + 1) & + (openedSecrets.at(2 * normalTupleIndex + 1) && normalTuples.at(normalTupleIndex).getA()); if (myId_ == 0) { val = val ^ - (openedSecrets.at(2 * normalTupleIndex) & + (openedSecrets.at(2 * normalTupleIndex) && openedSecrets.at(2 * normalTupleIndex + 1)); } rst[j] = val; @@ -829,7 +829,7 @@ SecretShareEngine::computeExecutionResultsFromOpenedShares( (openedSecrets.at(secretIndex) && tuple.getA()); if (myId_ == 0) { val = val ^ - (openedSecrets.at(leftSecretIndex) & + (openedSecrets.at(leftSecretIndex) && openedSecrets.at(secretIndex)); } compositeResult[k][j] = val;