Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. | 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC. |
| 6 #if defined(TARGET_ARCH_DBC) | 6 #if defined(TARGET_ARCH_DBC) |
| 7 | 7 |
| 8 #include "vm/flow_graph_compiler.h" | 8 #include "vm/flow_graph_compiler.h" |
| 9 | 9 |
| 10 #include "vm/ast_printer.h" | 10 #include "vm/ast_printer.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 232 } | 232 } |
| 233 __ PushConstant(dst_type); | 233 __ PushConstant(dst_type); |
| 234 __ PushConstant(dst_name); | 234 __ PushConstant(dst_name); |
| 235 __ AssertAssignable(__ AddConstant(test_cache)); | 235 __ AssertAssignable(__ AddConstant(test_cache)); |
| 236 RecordSafepoint(locs); | 236 RecordSafepoint(locs); |
| 237 AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id, token_pos); | 237 AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id, token_pos); |
| 238 if (is_optimizing()) { | 238 if (is_optimizing()) { |
| 239 // Assert assignable keeps the instance on the stack as the result, | 239 // Assert assignable keeps the instance on the stack as the result, |
| 240 // all other arguments are popped. | 240 // all other arguments are popped. |
| 241 ASSERT(locs->out(0).reg() == locs->in(0).reg()); | 241 ASSERT(locs->out(0).reg() == locs->in(0).reg()); |
| 242 __ Drop1(); | 242 // TODO(zra): __ Drop1() should be sufficient here, but it creates |
| 243 // flakes in checked-mode tests. Need to investigate. | |
| 244 __ PopLocal(locs->out(0).reg()); | |
|
zra
2016/06/16 21:38:02
I guess this might just be masking the underlying
Vyacheslav Egorov (Google)
2016/06/17 08:12:43
I am looking into this now.
For me flakes seem to
Vyacheslav Egorov (Google)
2016/06/17 11:01:07
I fixed it see a CL I have sent to you.
You can
zra
2016/06/21 20:24:08
Done.
| |
| 243 } | 245 } |
| 244 } | 246 } |
| 245 | 247 |
| 246 | 248 |
| 247 void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) { | 249 void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) { |
| 248 if (!is_optimizing()) { | 250 if (!is_optimizing()) { |
| 249 Definition* defn = instr->AsDefinition(); | 251 Definition* defn = instr->AsDefinition(); |
| 250 if ((defn != NULL) && | 252 if ((defn != NULL) && |
| 251 (defn->tag() != Instruction::kPushArgument) && | 253 (defn->tag() != Instruction::kPushArgument) && |
| 252 (defn->tag() != Instruction::kStoreIndexed) && | 254 (defn->tag() != Instruction::kStoreIndexed) && |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 496 void ParallelMoveResolver::RestoreFpuScratch(FpuRegister reg) { | 498 void ParallelMoveResolver::RestoreFpuScratch(FpuRegister reg) { |
| 497 UNIMPLEMENTED(); | 499 UNIMPLEMENTED(); |
| 498 } | 500 } |
| 499 | 501 |
| 500 | 502 |
| 501 #undef __ | 503 #undef __ |
| 502 | 504 |
| 503 } // namespace dart | 505 } // namespace dart |
| 504 | 506 |
| 505 #endif // defined TARGET_ARCH_DBC | 507 #endif // defined TARGET_ARCH_DBC |
| OLD | NEW |