Author: Mark de Wever Date: 2020-10-18T18:50:21+02:00 New Revision: 389c8d5b20a2ddea84d3b24edd533d5283f96582
URL: https://github.com/llvm/llvm-project/commit/389c8d5b20a2ddea84d3b24edd533d5283f96582 DIFF: https://github.com/llvm/llvm-project/commit/389c8d5b20a2ddea84d3b24edd533d5283f96582.diff LOG: [NFC] Make non-modifying members const. Implementing the likelihood attributes for the iteration statements adds a new helper function. This function can't be const qualified since these non-modifying members aren't const qualified. Added: Modified: clang/lib/CodeGen/CodeGenFunction.h clang/lib/CodeGen/CodeGenPGO.cpp clang/lib/CodeGen/CodeGenPGO.h Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 0a199e9b86ec..441e2c90c02e 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -1401,10 +1401,11 @@ class CodeGenFunction : public CodeGenTypeCache { CodeGenPGO PGO; /// Calculate branch weights appropriate for PGO data - llvm::MDNode *createProfileWeights(uint64_t TrueCount, uint64_t FalseCount); - llvm::MDNode *createProfileWeights(ArrayRef<uint64_t> Weights); + llvm::MDNode *createProfileWeights(uint64_t TrueCount, + uint64_t FalseCount) const; + llvm::MDNode *createProfileWeights(ArrayRef<uint64_t> Weights) const; llvm::MDNode *createProfileWeightsForLoop(const Stmt *Cond, - uint64_t LoopCount); + uint64_t LoopCount) const; public: /// Increment the profiler's counter for the given statement by \p StepV. diff --git a/clang/lib/CodeGen/CodeGenPGO.cpp b/clang/lib/CodeGen/CodeGenPGO.cpp index be3c50b99f30..c11d99a348d1 100644 --- a/clang/lib/CodeGen/CodeGenPGO.cpp +++ b/clang/lib/CodeGen/CodeGenPGO.cpp @@ -1038,7 +1038,7 @@ static uint32_t scaleBranchWeight(uint64_t Weight, uint64_t Scale) { } llvm::MDNode *CodeGenFunction::createProfileWeights(uint64_t TrueCount, - uint64_t FalseCount) { + uint64_t FalseCount) const { // Check for empty weights. if (!TrueCount && !FalseCount) return nullptr; @@ -1052,7 +1052,7 @@ llvm::MDNode *CodeGenFunction::createProfileWeights(uint64_t TrueCount, } llvm::MDNode * -CodeGenFunction::createProfileWeights(ArrayRef<uint64_t> Weights) { +CodeGenFunction::createProfileWeights(ArrayRef<uint64_t> Weights) const { // We need at least two elements to create meaningful weights. if (Weights.size() < 2) return nullptr; @@ -1074,8 +1074,9 @@ CodeGenFunction::createProfileWeights(ArrayRef<uint64_t> Weights) { return MDHelper.createBranchWeights(ScaledWeights); } -llvm::MDNode *CodeGenFunction::createProfileWeightsForLoop(const Stmt *Cond, - uint64_t LoopCount) { +llvm::MDNode * +CodeGenFunction::createProfileWeightsForLoop(const Stmt *Cond, + uint64_t LoopCount) const { if (!PGO.haveRegionCounts()) return nullptr; Optional<uint64_t> CondCount = PGO.getStmtCount(Cond); diff --git a/clang/lib/CodeGen/CodeGenPGO.h b/clang/lib/CodeGen/CodeGenPGO.h index dda8c66b6db2..906c5e406d77 100644 --- a/clang/lib/CodeGen/CodeGenPGO.h +++ b/clang/lib/CodeGen/CodeGenPGO.h @@ -59,7 +59,7 @@ class CodeGenPGO { /// Check if an execution count is known for a given statement. If so, return /// true and put the value in Count; else return false. - Optional<uint64_t> getStmtCount(const Stmt *S) { + Optional<uint64_t> getStmtCount(const Stmt *S) const { if (!StmtCountMap) return None; auto I = StmtCountMap->find(S); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
