Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: runtime/vm/flow_graph_compiler_dbc.cc

Issue 2481873005: clang-format runtime/vm (Closed)
Patch Set: Merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm64.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_dbc.cc
diff --git a/runtime/vm/flow_graph_compiler_dbc.cc b/runtime/vm/flow_graph_compiler_dbc.cc
index 00fc026767ee305c6582db1e8014fe2ec6fc5475..72fba96b2a234e8bba06f2a90bc5b0d57c88faf3 100644
--- a/runtime/vm/flow_graph_compiler_dbc.cc
+++ b/runtime/vm/flow_graph_compiler_dbc.cc
@@ -120,8 +120,7 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
// For the innermost environment, set outgoing arguments and the locals.
for (intptr_t i = current->Length() - 1;
- i >= current->fixed_parameter_count();
- i--) {
+ i >= current->fixed_parameter_count(); i--) {
builder->AddCopy(current->ValueAt(i), current->LocationAt(i), slot_ix++);
}
@@ -132,10 +131,9 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
while (current != NULL) {
// For any outer environment the deopt id is that of the call instruction
// which is recorded in the outer environment.
- builder->AddReturnAddress(
- current->function(),
- Thread::ToDeoptAfter(current->deopt_id()),
- slot_ix++);
+ builder->AddReturnAddress(current->function(),
+ Thread::ToDeoptAfter(current->deopt_id()),
+ slot_ix++);
builder->AddPcMarker(previous->function(), slot_ix++);
builder->AddConstant(previous->function(), slot_ix++);
@@ -143,18 +141,14 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
// The values of outgoing arguments can be changed from the inlined call so
// we must read them from the previous environment.
for (intptr_t i = previous->fixed_parameter_count() - 1; i >= 0; i--) {
- builder->AddCopy(previous->ValueAt(i),
- previous->LocationAt(i),
+ builder->AddCopy(previous->ValueAt(i), previous->LocationAt(i),
slot_ix++);
}
// Set the locals, note that outgoing arguments are not in the environment.
for (intptr_t i = current->Length() - 1;
- i >= current->fixed_parameter_count();
- i--) {
- builder->AddCopy(current->ValueAt(i),
- current->LocationAt(i),
- slot_ix++);
+ i >= current->fixed_parameter_count(); i--) {
+ builder->AddCopy(current->ValueAt(i), current->LocationAt(i), slot_ix++);
}
builder->AddCallerFp(slot_ix++);
@@ -195,13 +189,12 @@ void FlowGraphCompiler::RecordAfterCall(Instruction* instr) {
pending_deoptimization_env_->DropArguments(instr->ArgumentCount());
AddDeoptIndexAtCall(deopt_id_after);
// This descriptor is needed for exception handling in optimized code.
- AddCurrentDescriptor(RawPcDescriptors::kOther,
- deopt_id_after, instr->token_pos());
+ AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id_after,
+ instr->token_pos());
} else {
// Add deoptimization continuation point after the call and before the
// arguments are removed.
- AddCurrentDescriptor(RawPcDescriptors::kDeopt,
- deopt_id_after,
+ AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after,
instr->token_pos());
}
}
@@ -244,12 +237,9 @@ void FlowGraphCompiler::GenerateAssertAssignable(TokenPosition token_pos,
const Class& type_class = Class::Handle(zone(), dst_type.type_class());
if (type_class.NumTypeArguments() == 0) {
const Class& smi_class = Class::Handle(zone(), Smi::Class());
- may_be_smi = smi_class.IsSubtypeOf(TypeArguments::Handle(zone()),
- type_class,
- TypeArguments::Handle(zone()),
- NULL,
- NULL,
- Heap::kOld);
+ may_be_smi = smi_class.IsSubtypeOf(
+ TypeArguments::Handle(zone()), type_class,
+ TypeArguments::Handle(zone()), NULL, NULL, Heap::kOld);
}
}
__ AssertAssignable(may_be_smi ? 1 : 0, __ AddConstant(test_cache));
@@ -279,14 +269,12 @@ void FlowGraphCompiler::GenerateAssertAssignable(TokenPosition token_pos,
void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) {
if (!is_optimizing()) {
Definition* defn = instr->AsDefinition();
- if ((defn != NULL) &&
- (defn->tag() != Instruction::kPushArgument) &&
+ if ((defn != NULL) && (defn->tag() != Instruction::kPushArgument) &&
(defn->tag() != Instruction::kStoreIndexed) &&
(defn->tag() != Instruction::kStoreStaticField) &&
(defn->tag() != Instruction::kStoreLocal) &&
(defn->tag() != Instruction::kStoreInstanceField) &&
- (defn->tag() != Instruction::kDropTemps) &&
- !defn->HasTemp()) {
+ (defn->tag() != Instruction::kDropTemps) && !defn->HasTemp()) {
__ Drop1();
}
}
@@ -296,7 +284,7 @@ void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) {
void FlowGraphCompiler::GenerateInlinedGetter(intptr_t offset) {
__ Move(0, -(1 + kParamEndSlotFromFp));
ASSERT(offset % kWordSize == 0);
- if (Utils::IsInt(8, offset/ kWordSize)) {
+ if (Utils::IsInt(8, offset / kWordSize)) {
__ LoadField(0, 0, offset / kWordSize);
} else {
__ LoadFieldExt(0, 0);
@@ -310,7 +298,7 @@ void FlowGraphCompiler::GenerateInlinedSetter(intptr_t offset) {
__ Move(0, -(2 + kParamEndSlotFromFp));
__ Move(1, -(1 + kParamEndSlotFromFp));
ASSERT(offset % kWordSize == 0);
- if (Utils::IsInt(8, offset/ kWordSize)) {
+ if (Utils::IsInt(8, offset / kWordSize)) {
__ StoreField(0, offset / kWordSize, 1);
} else {
__ StoreFieldExt(0, 1);
@@ -328,21 +316,19 @@ void FlowGraphCompiler::EmitFrameEntry() {
const int num_opt_named_params = function.NumOptionalNamedParameters();
const int num_params =
num_fixed_params + num_opt_pos_params + num_opt_named_params;
- const bool has_optional_params = (num_opt_pos_params != 0) ||
- (num_opt_named_params != 0);
+ const bool has_optional_params =
+ (num_opt_pos_params != 0) || (num_opt_named_params != 0);
const int num_locals = parsed_function().num_stack_locals();
const intptr_t context_index =
-parsed_function().current_context_var()->index() - 1;
- if (CanOptimizeFunction() &&
- function.IsOptimizable() &&
+ if (CanOptimizeFunction() && function.IsOptimizable() &&
(!is_optimizing() || may_reoptimize())) {
__ HotCheck(!is_optimizing(), GetOptimizationThreshold());
}
if (has_optional_params) {
- __ EntryOptional(num_fixed_params,
- num_opt_pos_params,
+ __ EntryOptional(num_fixed_params, num_opt_pos_params,
num_opt_named_params);
} else if (!is_optimizing()) {
__ Entry(num_fixed_params, num_locals, context_index);
@@ -392,17 +378,17 @@ void FlowGraphCompiler::EmitFrameEntry() {
if (has_optional_params) {
if (!is_optimizing()) {
ASSERT(num_locals > 0); // There is always at least context_var.
- __ Frame(num_locals); // Reserve space for locals.
+ __ Frame(num_locals); // Reserve space for locals.
} else if (flow_graph_.graph_entry()->spill_slot_count() >
- flow_graph_.num_copied_params()) {
+ flow_graph_.num_copied_params()) {
__ Frame(flow_graph_.graph_entry()->spill_slot_count() -
- flow_graph_.num_copied_params());
+ flow_graph_.num_copied_params());
}
}
if (function.IsClosureFunction()) {
- Register reg = is_optimizing() ? flow_graph_.num_copied_params()
- : context_index;
+ Register reg =
+ is_optimizing() ? flow_graph_.num_copied_params() : context_index;
Register closure_reg = reg;
LocalScope* scope = parsed_function().node_sequence()->scope();
LocalVariable* local = scope->VariableAt(0);
@@ -414,7 +400,7 @@ void FlowGraphCompiler::EmitFrameEntry() {
__ LoadField(reg, closure_reg, Closure::context_offset() / kWordSize);
} else if (has_optional_params && !is_optimizing()) {
__ LoadConstant(context_index,
- Object::Handle(isolate()->object_store()->empty_context()));
+ Object::Handle(isolate()->object_store()->empty_context()));
}
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm64.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698