Fix cpplint whitespace/comments issues
Change-Id: Iae286862c85fb8fd8901eae1204cd6d271d69496
diff --git a/compiler/sea_ir/code_gen.cc b/compiler/sea_ir/code_gen.cc
index 41bf9a6..f359849 100644
--- a/compiler/sea_ir/code_gen.cc
+++ b/compiler/sea_ir/code_gen.cc
@@ -111,7 +111,7 @@
void CodeGenVisitor::Visit(InstructionNode* instruction) {
std::string instr = instruction->GetInstruction()->DumpString(NULL);
- DCHECK(0); // This whole function is useful only during development.
+ DCHECK(0); // This whole function is useful only during development.
}
void CodeGenVisitor::Visit(ConstInstructionNode* instruction) {
std::string instr = instruction->GetInstruction()->DumpString(NULL);
@@ -270,4 +270,4 @@
DCHECK_EQ(signature->GetDefinitions().size(), 1u) << "Signature nodes must correspond to a single parameter register.";
}
-} // end namespace sea_ir
+} // namespace sea_ir
diff --git a/compiler/sea_ir/code_gen.h b/compiler/sea_ir/code_gen.h
index 0f0b2f7..aba8d5c 100644
--- a/compiler/sea_ir/code_gen.h
+++ b/compiler/sea_ir/code_gen.h
@@ -103,7 +103,7 @@
void Visit(ConstInstructionNode* instruction) { }
void Visit(ReturnInstructionNode* instruction) { }
void Visit(IfNeInstructionNode* instruction) { }
- //void Visit(AddIntLitInstructionNode* instruction) { }
+ // void Visit(AddIntLitInstructionNode* instruction) { }
void Visit(MoveResultInstructionNode* instruction) { }
void Visit(InvokeStaticInstructionNode* instruction) { }
void Visit(AddIntInstructionNode* instruction) { }
@@ -122,7 +122,7 @@
void Visit(ConstInstructionNode* instruction) { }
void Visit(ReturnInstructionNode* instruction) { }
void Visit(IfNeInstructionNode* instruction) { }
- //void Visit(AddIntLitInstructionNode* instruction) { }
+ // void Visit(AddIntLitInstructionNode* instruction) { }
void Visit(MoveResultInstructionNode* instruction) { }
void Visit(InvokeStaticInstructionNode* instruction) { }
void Visit(AddIntInstructionNode* instruction) { }
@@ -141,7 +141,7 @@
void Visit(ConstInstructionNode* instruction);
void Visit(ReturnInstructionNode* instruction);
void Visit(IfNeInstructionNode* instruction);
- //void Visit(AddIntLitInstructionNode* instruction);
+ // void Visit(AddIntLitInstructionNode* instruction);
void Visit(MoveResultInstructionNode* instruction);
void Visit(InvokeStaticInstructionNode* instruction);
void Visit(AddIntInstructionNode* instruction);
@@ -149,5 +149,5 @@
void Visit(IfEqzInstructionNode* instruction);
void Visit(PhiInstructionNode* region) { }
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_CODE_GEN_H_
diff --git a/compiler/sea_ir/frontend.cc b/compiler/sea_ir/frontend.cc
index bae3cb2..8fc1cf8 100644
--- a/compiler/sea_ir/frontend.cc
+++ b/compiler/sea_ir/frontend.cc
@@ -62,7 +62,7 @@
#if defined(ART_USE_PORTABLE_COMPILER)
, llvm_compilation_unit
#endif
- ); // NOLINT
+ ); // NOLINT
}
extern "C" art::CompiledMethod*
@@ -79,4 +79,4 @@
}
#endif
-} // end namespace art
+} // namespace art
diff --git a/compiler/sea_ir/instruction_nodes.h b/compiler/sea_ir/instruction_nodes.h
index f6d2dd8..5c9cfe1 100644
--- a/compiler/sea_ir/instruction_nodes.h
+++ b/compiler/sea_ir/instruction_nodes.h
@@ -144,7 +144,7 @@
std::stringstream ss;
ss << def_it->first;
result.append(ss.str());
- result += "\"] ; // ssa edge\n";
+ result += "\"] ; // ssa edge\n";
}
}
}
@@ -179,7 +179,7 @@
public:
explicit MoveResultInstructionNode(const art::Instruction* inst): InstructionNode(inst) { }
std::vector<int> GetUses() {
- std::vector<int> uses; // Using vector<> instead of set<> because order matters.
+ std::vector<int> uses; // Using vector<> instead of set<> because order matters.
uses.push_back(RETURN_REGISTER);
return uses;
}
@@ -246,5 +246,5 @@
v->Traverse(this);
}
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_INSTRUCTION_NODES_H_
diff --git a/compiler/sea_ir/instruction_tools.cc b/compiler/sea_ir/instruction_tools.cc
index 5433591..9627497 100644
--- a/compiler/sea_ir/instruction_tools.cc
+++ b/compiler/sea_ir/instruction_tools.cc
@@ -794,4 +794,4 @@
// FF UNUSED_FF
DF_NOP
};
-} // end namespace sea_ir
+} // namespace sea_ir
diff --git a/compiler/sea_ir/instruction_tools.h b/compiler/sea_ir/instruction_tools.h
index 0c22753..d387100 100644
--- a/compiler/sea_ir/instruction_tools.h
+++ b/compiler/sea_ir/instruction_tools.h
@@ -121,5 +121,5 @@
static bool IsDefinition(const art::Instruction* instruction);
static const int instruction_attributes_[];
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_
diff --git a/compiler/sea_ir/sea.cc b/compiler/sea_ir/sea.cc
index d1db7b6..3488afd 100644
--- a/compiler/sea_ir/sea.cc
+++ b/compiler/sea_ir/sea.cc
@@ -153,16 +153,16 @@
while (finger1 != finger2) {
while (finger1->GetRPO() > finger2->GetRPO()) {
DCHECK(NULL != finger1);
- finger1 = finger1->GetIDominator(); // should have: finger1 != NULL
+ finger1 = finger1->GetIDominator(); // should have: finger1 != NULL
DCHECK(NULL != finger1);
}
while (finger1->GetRPO() < finger2->GetRPO()) {
DCHECK(NULL != finger2);
- finger2 = finger2->GetIDominator(); // should have: finger1 != NULL
+ finger2 = finger2->GetIDominator(); // should have: finger1 != NULL
DCHECK(NULL != finger2);
}
}
- return finger1; // finger1 should be equal to finger2 at this point.
+ return finger1; // finger1 should be equal to finger2 at this point.
}
void SeaGraph::ComputeDownExposedDefs() {
@@ -248,7 +248,7 @@
int32_t offset = inst->GetTargetOffset();
std::map<const uint16_t*, Region*>::iterator it = target_regions.find(&code[i + offset]);
DCHECK(it != target_regions.end());
- AddEdge(r, it->second); // Add edge to branch target.
+ AddEdge(r, it->second); // Add edge to branch target.
}
std::map<const uint16_t*, Region*>::iterator it = target_regions.find(&code[i]);
@@ -257,7 +257,7 @@
Region* nextRegion = it->second;
if (last_node->GetInstruction()->IsBranch()
&& last_node->GetInstruction()->CanFlowThrough()) {
- AddEdge(r, it->second); // Add flow-through edge.
+ AddEdge(r, it->second); // Add flow-through edge.
}
r = nextRegion;
}
@@ -421,7 +421,7 @@
uint32_t class_def_idx, uint32_t method_idx, const art::DexFile& dex_file) {
// Two passes: Builds the intermediate structure (non-SSA) of the sea-ir for the function.
BuildMethodSeaGraph(code_item, dex_file, class_def_idx, method_idx);
- //Pass: Compute reverse post-order of regions.
+ // Pass: Compute reverse post-order of regions.
ComputeRPO();
// Multiple passes: compute immediate dominators.
ComputeIDominators();
@@ -502,14 +502,14 @@
for (std::vector<PhiInstructionNode*>::const_iterator cit = phi_instructions_.begin();
cit != phi_instructions_.end(); cit++) {
(*cit)->ToDot(result);
- result += StringId() + " -> " + (*cit)->StringId() + "; // phi-function \n";
+ result += StringId() + " -> " + (*cit)->StringId() + "; // phi-function \n";
}
// Save instruction nodes.
for (std::vector<InstructionNode*>::const_iterator cit = instructions_.begin();
cit != instructions_.end(); cit++) {
(*cit)->ToDot(result);
- result += StringId() + " -> " + (*cit)->StringId() + "; // region -> instruction \n";
+ result += StringId() + " -> " + (*cit)->StringId() + "; // region -> instruction \n";
}
for (std::vector<Region*>::const_iterator cit = successors_.begin(); cit != successors_.end();
@@ -527,14 +527,14 @@
reaching_set_it++) {
result += (*reaching_set_it)->StringId() +
" -> " + StringId() +
- " [style=dotted]; // Reaching def.\n";
+ " [style=dotted]; // Reaching def.\n";
}
}
// Save dominance frontier.
for (std::set<Region*>::const_iterator cit = df_.begin(); cit != df_.end(); cit++) {
result += StringId() +
" -> " + (*cit)->StringId() +
- " [color=gray]; // Dominance frontier.\n";
+ " [color=gray]; // Dominance frontier.\n";
}
result += "// End Region.\n";
}
@@ -711,7 +711,7 @@
if (NULL != def_it->second) {
result += def_it->second->StringId() + " -> " + StringId() +"[color=red,label=\"";
result += art::StringPrintf("%d", def_it->first);
- result += "\"] ; // ssa edge\n";
+ result += "\"] ; // ssa edge\n";
}
}
}
@@ -740,7 +740,7 @@
}
std::vector<int> InstructionNode::GetUses() {
- std::vector<int> uses; // Using vector<> instead of set<> because order matters.
+ std::vector<int> uses; // Using vector<> instead of set<> because order matters.
if (!InstructionTools::IsDefinition(instruction_) && (instruction_->HasVRegA())) {
int vA = instruction_->VRegA();
uses.push_back(vA);
@@ -770,8 +770,8 @@
def_it != defs_from_pred->end(); def_it++) {
result += (*def_it)->StringId() + " -> " + StringId() +"[color=red,label=\"vR = ";
result += art::StringPrintf("%d", GetRegisterNumber());
- result += "\"] ; // phi-ssa edge\n";
+ result += "\"] ; // phi-ssa edge\n";
}
}
}
-} // end namespace sea_ir
+} // namespace sea_ir
diff --git a/compiler/sea_ir/sea.h b/compiler/sea_ir/sea.h
index a0a8086..25ab1fe 100644
--- a/compiler/sea_ir/sea.h
+++ b/compiler/sea_ir/sea.h
@@ -256,7 +256,7 @@
static void ComputeRPO(Region* crt_bb, int& crt_rpo);
// Returns the "lowest common ancestor" of @i and @j in the dominator tree.
static Region* Intersect(Region* i, Region* j);
- //Returns the vector of parameters of the function.
+ // Returns the vector of parameters of the function.
std::vector<SignatureNode*>* GetParameterNodes() {
return ¶meters_;
}
@@ -320,5 +320,5 @@
std::vector<Region*> regions_;
std::vector<SignatureNode*> parameters_;
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_SEA_H_
diff --git a/compiler/sea_ir/sea_node.h b/compiler/sea_ir/sea_node.h
index efc1b0d..5d28f8a 100644
--- a/compiler/sea_ir/sea_node.h
+++ b/compiler/sea_ir/sea_node.h
@@ -76,5 +76,5 @@
// operators because that would lead to duplication of their unique ids.
DISALLOW_COPY_AND_ASSIGN(SeaNode);
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_SEA_NODE_H_
diff --git a/compiler/sea_ir/visitor.h b/compiler/sea_ir/visitor.h
index 9859008..a4fec7b 100644
--- a/compiler/sea_ir/visitor.h
+++ b/compiler/sea_ir/visitor.h
@@ -59,7 +59,7 @@
virtual void Visit(ConstInstructionNode* instruction) = 0;
virtual void Visit(ReturnInstructionNode* instruction) = 0;
virtual void Visit(IfNeInstructionNode* instruction) = 0;
- //virtual void Visit(AddIntLitInstructionNode* instruction) = 0;
+ // virtual void Visit(AddIntLitInstructionNode* instruction) = 0;
virtual void Visit(MoveResultInstructionNode* instruction) = 0;
virtual void Visit(InvokeStaticInstructionNode* instruction) = 0;
virtual void Visit(AddIntInstructionNode* instruction) = 0;
@@ -90,5 +90,5 @@
protected:
std::vector<Region*> ordered_regions_;
};
-} // end namespace sea_ir
+} // namespace sea_ir
#endif // ART_COMPILER_SEA_IR_VISITOR_H_