Fixed 100 char limit in SEA IR files.
Change-Id: I0fd6143ffdf50e3d2ac14901e9e75471a293df30
diff --git a/compiler/sea_ir/code_gen.cc b/compiler/sea_ir/code_gen.cc
index f359849..a513907 100644
--- a/compiler/sea_ir/code_gen.cc
+++ b/compiler/sea_ir/code_gen.cc
@@ -66,7 +66,8 @@
std::vector<llvm::Type*> parameter_types(parameters->size(),
llvm::Type::getInt32Ty(*llvm_data_->context_));
// Build llvm function name.
- std::string function_name = art::StringPrintf("class=%d_method=%d", graph->class_def_idx_, graph->method_idx_);
+ std::string function_name = art::StringPrintf(
+ "class=%d_method=%d", graph->class_def_idx_, graph->method_idx_);
// Build llvm function type and parameters.
llvm::FunctionType *function_type = llvm::FunctionType::get(
@@ -259,15 +260,18 @@
void CodeGenVisitor::Visit(SignatureNode* signature) {
std::cout << "Signature: ;" << "Id:" << signature->StringId() << std::endl;
- DCHECK_EQ(signature->GetDefinitions().size(), 1u) << "Signature nodes must correspond to a single parameter register.";
+ DCHECK_EQ(signature->GetDefinitions().size(), 1u) <<
+ "Signature nodes must correspond to a single parameter register.";
}
void CodeGenPrepassVisitor::Visit(SignatureNode* signature) {
std::cout << "Signature: ;" << "Id:" << signature->StringId() << std::endl;
- DCHECK_EQ(signature->GetDefinitions().size(), 1u) << "Signature nodes must correspond to a single parameter register.";
+ DCHECK_EQ(signature->GetDefinitions().size(), 1u) <<
+ "Signature nodes must correspond to a single parameter register.";
}
void CodeGenPostpassVisitor::Visit(SignatureNode* signature) {
std::cout << "Signature: ;" << "Id:" << signature->StringId() << std::endl;
- DCHECK_EQ(signature->GetDefinitions().size(), 1u) << "Signature nodes must correspond to a single parameter register.";
+ DCHECK_EQ(signature->GetDefinitions().size(), 1u) <<
+ "Signature nodes must correspond to a single parameter register.";
}
} // namespace sea_ir
diff --git a/compiler/sea_ir/frontend.cc b/compiler/sea_ir/frontend.cc
index ebc767c..5843388 100644
--- a/compiler/sea_ir/frontend.cc
+++ b/compiler/sea_ir/frontend.cc
@@ -57,8 +57,8 @@
jobject class_loader,
const DexFile& dex_file,
llvm::LlvmCompilationUnit* llvm_compilation_unit) {
- return CompileMethodWithSeaIr(compiler, backend, code_item, access_flags, invoke_type, class_def_idx,
- method_idx, class_loader, dex_file
+ return CompileMethodWithSeaIr(compiler, backend, code_item, access_flags, invoke_type,
+ class_def_idx, method_idx, class_loader, dex_file
#if defined(ART_USE_PORTABLE_COMPILER)
, llvm_compilation_unit
#endif
@@ -71,7 +71,8 @@
uint32_t access_flags, art::InvokeType invoke_type,
uint32_t class_def_idx, uint32_t method_idx, jobject class_loader,
const art::DexFile& dex_file) {
- // TODO: check method fingerprint here to determine appropriate backend type. Until then, use build default
+ // TODO: Check method fingerprint here to determine appropriate backend type.
+ // Until then, use build default
art::CompilerBackend backend = compiler.GetCompilerBackend();
return art::SeaIrCompileOneMethod(compiler, backend, code_item, access_flags, invoke_type,
class_def_idx, method_idx, class_loader, dex_file,
diff --git a/compiler/sea_ir/sea.cc b/compiler/sea_ir/sea.cc
index 17ee2dd..e9a3e1c 100644
--- a/compiler/sea_ir/sea.cc
+++ b/compiler/sea_ir/sea.cc
@@ -237,7 +237,8 @@
sea_ir::InstructionNode* node = NULL;
while (i < size_in_code_units) {
const art::Instruction* inst = art::Instruction::At(&code[i]);
- std::vector<InstructionNode*> sea_instructions_for_dalvik = sea_ir::InstructionNode::Create(inst);
+ std::vector<InstructionNode*> sea_instructions_for_dalvik =
+ sea_ir::InstructionNode::Create(inst);
for (std::vector<InstructionNode*>::const_iterator cit = sea_instructions_for_dalvik.begin();
sea_instructions_for_dalvik.end() != cit; ++cit) {
last_node = node;
@@ -249,7 +250,6 @@
DCHECK(it != target_regions.end());
AddEdge(r, it->second); // Add edge to branch target.
}
-
std::map<const uint16_t*, Region*>::iterator it = target_regions.find(&code[i]);
if (target_regions.end() != it) {
// Get the already created region because this is a branch target.
@@ -331,7 +331,8 @@
int global = *globals_it;
// Copy the set, because we will modify the worklist as we go.
std::set<Region*> worklist((*(blocks.find(global))).second);
- for (std::set<Region*>::const_iterator b_it = worklist.begin(); b_it != worklist.end(); b_it++) {
+ for (std::set<Region*>::const_iterator b_it = worklist.begin();
+ b_it != worklist.end(); b_it++) {
std::set<Region*>* df = (*b_it)->GetDominanceFrontier();
for (std::set<Region*>::const_iterator df_it = df->begin(); df_it != df->end(); df_it++) {
if ((*df_it)->InsertPhiFor(global)) {
@@ -560,7 +561,8 @@
pred_it != predecessors_.end(); pred_it++) {
// The reaching_defs variable will contain reaching defs __for current predecessor only__
std::map<int, std::set<sea_ir::InstructionNode*>* > reaching_defs;
- std::map<int, std::set<sea_ir::InstructionNode*>* >* pred_reaching = (*pred_it)->GetReachingDefs();
+ std::map<int, std::set<sea_ir::InstructionNode*>* >* pred_reaching =
+ (*pred_it)->GetReachingDefs();
const std::map<int, InstructionNode*>* de_defs = (*pred_it)->GetDownExposedDefs();
// The definitions from the reaching set of the predecessor
@@ -578,7 +580,8 @@
// Now we combine the reaching map coming from the current predecessor (reaching_defs)
// with the accumulated set from all predecessors so far (from new_reaching).
- std::map<int, std::set<sea_ir::InstructionNode*>*>::iterator reaching_it = reaching_defs.begin();
+ std::map<int, std::set<sea_ir::InstructionNode*>*>::iterator reaching_it =
+ reaching_defs.begin();
for (; reaching_it != reaching_defs.end(); reaching_it++) {
std::map<int, std::set<sea_ir::InstructionNode*>*>::iterator crt_entry =
new_reaching.find(reaching_it->first);
@@ -598,7 +601,8 @@
// TODO: Find formal proof.
int old_size = 0;
if (-1 == reaching_defs_size_) {
- std::map<int, std::set<sea_ir::InstructionNode*>*>::iterator reaching_it = reaching_defs_.begin();
+ std::map<int, std::set<sea_ir::InstructionNode*>*>::iterator reaching_it =
+ reaching_defs_.begin();
for (; reaching_it != reaching_defs_.end(); reaching_it++) {
old_size += (*reaching_it).second->size();
}
@@ -753,7 +757,8 @@
result += ")\"";
result += "];\n";
- for (std::vector<std::vector<InstructionNode*>*>::const_iterator pred_it = definition_edges_.begin();
+ for (std::vector<std::vector<InstructionNode*>*>::const_iterator pred_it =
+ definition_edges_.begin();
pred_it != definition_edges_.end(); pred_it++) {
std::vector<InstructionNode*>* defs_from_pred = *pred_it;
for (std::vector<InstructionNode* >::const_iterator def_it = defs_from_pred->begin();