cpplint: Cleanup errors
Cleanup errors from upstream cpplint in preparation
for moving art's cpplint fork to upstream tip-of-tree cpplint.
Test: cd art && mm
Bug: 68951293
Change-Id: I15faed4594cbcb8399850f8bdee39d42c0c5b956
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index a8f7e86..9e7455d 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -3891,7 +3891,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -3921,7 +3921,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
default:
@@ -4102,7 +4102,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -4146,7 +4146,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
default:
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 9b35160..ad0e71a 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -2545,7 +2545,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -2862,7 +2862,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -2912,7 +2912,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
default:
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 8f7961e..d64a497 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -970,7 +970,7 @@
case kCondGT: return kAbove;
case kCondGE: return kAboveEqual;
default: break; // should not happen
- };
+ }
LOG(FATAL) << "Unreachable";
UNREACHABLE();
}
@@ -2635,7 +2635,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -2948,7 +2948,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
case DataType::Type::kFloat64:
@@ -3000,7 +3000,7 @@
default:
LOG(FATAL) << "Unexpected type conversion from " << input_type
<< " to " << result_type;
- };
+ }
break;
default:
diff --git a/compiler/optimizing/induction_var_analysis.cc b/compiler/optimizing/induction_var_analysis.cc
index 0987293..e2747af 100644
--- a/compiler/optimizing/induction_var_analysis.cc
+++ b/compiler/optimizing/induction_var_analysis.cc
@@ -683,7 +683,7 @@
CreateConstant(0, type_),
c->fetch,
type_);
- };
+ }
break;
case kRem:
// Idiomatic MOD wrap-around induction.
diff --git a/compiler/optimizing/induction_var_analysis_test.cc b/compiler/optimizing/induction_var_analysis_test.cc
index 4c11ad4..f87b46d 100644
--- a/compiler/optimizing/induction_var_analysis_test.cc
+++ b/compiler/optimizing/induction_var_analysis_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <regex>
+#include <regex> // NOLINT [build/c++11] [5]
#include "base/arena_allocator.h"
#include "builder.h"
diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc
index c672dae..69c5827 100644
--- a/compiler/optimizing/loop_optimization.cc
+++ b/compiler/optimizing/loop_optimization.cc
@@ -765,7 +765,7 @@
vector_static_peeling_factor_ = 0;
vector_dynamic_peeling_candidate_ = nullptr;
vector_runtime_test_a_ =
- vector_runtime_test_b_= nullptr;
+ vector_runtime_test_b_ = nullptr;
// Phis in the loop-body prevent vectorization.
if (!block->GetPhis().IsEmpty()) {
diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h
index 9aba912..e90c30d 100644
--- a/compiler/optimizing/optimizing_unit_test.h
+++ b/compiler/optimizing/optimizing_unit_test.h
@@ -161,7 +161,7 @@
// An alias for the empty string used to make it clear that a line is
// removed in a diff.
-static const std::string removed = "";
+static const std::string removed = ""; // NOLINT [runtime/string] [4]
// Naive patch command: apply a diff to a string.
inline std::string Patch(const std::string& original, const diff_t& diff) {
diff --git a/compiler/optimizing/scheduler.h b/compiler/optimizing/scheduler.h
index afdf6f1..a6e1603 100644
--- a/compiler/optimizing/scheduler.h
+++ b/compiler/optimizing/scheduler.h
@@ -392,7 +392,7 @@
*/
class RandomSchedulingNodeSelector : public SchedulingNodeSelector {
public:
- explicit RandomSchedulingNodeSelector() : seed_(0) {
+ RandomSchedulingNodeSelector() : seed_(0) {
seed_ = static_cast<uint32_t>(NanoTime());
srand(seed_);
}
diff --git a/compiler/optimizing/side_effects_analysis.h b/compiler/optimizing/side_effects_analysis.h
index cf00e48..c0f81a9 100644
--- a/compiler/optimizing/side_effects_analysis.h
+++ b/compiler/optimizing/side_effects_analysis.h
@@ -25,7 +25,7 @@
class SideEffectsAnalysis : public HOptimization {
public:
- SideEffectsAnalysis(HGraph* graph, const char* pass_name = kSideEffectsAnalysisPassName)
+ explicit SideEffectsAnalysis(HGraph* graph, const char* pass_name = kSideEffectsAnalysisPassName)
: HOptimization(graph, pass_name),
graph_(graph),
block_effects_(graph->GetBlocks().size(),