Chromium Code Reviews| Index: src/compiler/code-generator.cc |
| diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc |
| index 71f9604d7ff206d03a464ce5eff2c3f828ca7c3e..225e1f98b15c318ad7d1a4e0624208f822e7d9f5 100644 |
| --- a/src/compiler/code-generator.cc |
| +++ b/src/compiler/code-generator.cc |
| @@ -153,9 +153,17 @@ Handle<Code> CodeGenerator::GenerateCode() { |
| } |
| } |
| - for (int i = block->code_start(); i < block->code_end(); ++i) { |
| - Instruction* instr = code()->InstructionAt(i); |
| - AssembleInstruction(instr, block); |
| + if (FLAG_enable_embedded_constant_pool && !block->needs_frame()) { |
| + ConstantPoolUnavailableScope constant_pool_unavailable(masm()); |
| + for (int i = block->code_start(); i < block->code_end(); ++i) { |
| + Instruction* instr = code()->InstructionAt(i); |
| + AssembleInstruction(instr, block); |
| + } |
| + } else { |
| + for (int i = block->code_start(); i < block->code_end(); ++i) { |
| + Instruction* instr = code()->InstructionAt(i); |
|
Mircea Trofin
2016/03/30 22:39:24
To avoid code duplication, could you please factor
MTBrandyberry
2016/03/30 22:57:47
Will do.
MTBrandyberry
2016/03/31 02:06:35
Done.
|
| + AssembleInstruction(instr, block); |
| + } |
| } |
| } |
| } |