Cleanup more isolate usage in ia32 files.

src/ia32/deoptimizer-ia32.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 113 matching lines @@
       ASSERT(RelocInfo::kMinRelocCommentSize ==
              pos_before - reloc_info_writer.pos());
     }
     // Replace relocation information on the code object.
     code->set_relocation_info(*new_reloc);
   }
 }
 
 
 void Deoptimizer::DeoptimizeFunction(JSFunction* function) {
   HandleScope scope;

[Vitaly Repeshko, 2011/03/25 12:57:51]

Is this really needed?

[Mads Ager (chromium), 2011/03/25 13:09:26]

No you are right. That is not needed. I have extracted the isolate earlier in
the method above and passed it to the handlescope constructor.

[Mads Ager (chromium), 2011/03/25 13:15:53]

I was wrong. We need it. The code patcher allocates handles to put in the code
and there is no other handle scope here. I'll get the isolate early and use it
for handle scope construction.

[Vitaly Repeshko, 2011/03/25 13:25:03]

Is it only the self-reference code handle or are there more?

[Mads Ager (chromium), 2011/03/25 13:37:42]

That is the only one that I found by quick inspection. With the isolate
extracted early the cost of the handle scope is very little compared to the rest
of the work here.

[Vitaly Repeshko, 2011/03/25 13:45:21]

Sure. The performance is not a concern here. I just was worried that we have
hidden handlified code that may allocate when not caught by the debug mode
AssertNoAllocation.

   AssertNoAllocation no_allocation;
 
   if (!function->IsOptimized()) return;

[Vitaly Repeshko, 2011/03/25 12:57:51]

I don't know how often this happens, but it still should be the first line in
the function.

[Mads Ager (chromium), 2011/03/25 13:09:26]

Done.

 
   // Get the optimized code.
   Code* code = function->code();
   Address code_start_address = code->instruction_start();
 
   // We will overwrite the code's relocation info in-place. Relocation info
   // is written backward. The relocation info is the payload of a byte
   // array.  Later on we will slide this to the start of the byte array and
   // create a filler object in the remaining space.
   ByteArray* reloc_info = code->relocation_info();
@@ skipping 35 matching lines @@
   ZapCodeRange(prev_address,
                code_start_address + code->safepoint_table_offset());
 
   // Move the relocation info to the beginning of the byte array.
   int new_reloc_size = reloc_end_address - reloc_info_writer.pos();
   memmove(code->relocation_start(), reloc_info_writer.pos(), new_reloc_size);
 
   // The relocation info is in place, update the size.
   reloc_info->set_length(new_reloc_size);
 
+  Isolate* isolate = code->GetIsolate();

[Vitaly Repeshko, 2011/03/25 12:57:51]

Move this up and use the isolate in HandleScope if the scope required.

[Mads Ager (chromium), 2011/03/25 13:09:26]

Done.

+
   // Handle the junk part after the new relocation info. We will create
   // a non-live object in the extra space at the end of the former reloc info.
   Address junk_address = reloc_info->address() + reloc_info->Size();
   ASSERT(junk_address <= reloc_end_address);
-  HEAP->CreateFillerObjectAt(junk_address, reloc_end_address - junk_address);
+  isolate->heap()->CreateFillerObjectAt(junk_address,
+                                        reloc_end_address - junk_address);
 
   // Add the deoptimizing code to the list.
   DeoptimizingCodeListNode* node = new DeoptimizingCodeListNode(code);
-  DeoptimizerData* data = code->GetIsolate()->deoptimizer_data();
+  DeoptimizerData* data = isolate->deoptimizer_data();
   node->set_next(data->deoptimizing_code_list_);
   data->deoptimizing_code_list_ = node;
 
   // Set the code for the function to non-optimized version.
   function->ReplaceCode(function->shared()->code());
 
   if (FLAG_trace_deopt) {
     PrintF("[forced deoptimization: ");
     function->PrintName();
     PrintF(" / %x]\n", reinterpret_cast<uint32_t>(function));
@@ skipping 530 matching lines @@
   }
   __ bind(&done);
 }
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32