| Index: src/x87/macro-assembler-x87.cc | 
| diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc | 
| index 4651f57847aac8cfb0877c9731007595d7b7bc6c..09dd474f0af3d9616de5a9ae52e5246bbd841a79 100644 | 
| --- a/src/x87/macro-assembler-x87.cc | 
| +++ b/src/x87/macro-assembler-x87.cc | 
| @@ -19,12 +19,12 @@ namespace internal { | 
| // ------------------------------------------------------------------------- | 
| // MacroAssembler implementation. | 
|  | 
| -MacroAssembler::MacroAssembler(Isolate* arg_isolate, void* buffer, int size) | 
| +MacroAssembler::MacroAssembler(Isolate* arg_isolate, void* buffer, int size, | 
| +                               CodeObjectRequired create_code_object) | 
| : Assembler(arg_isolate, buffer, size), | 
| generating_stub_(false), | 
| has_frame_(false) { | 
| -  if (isolate() != NULL) { | 
| -    // TODO(titzer): should we just use a null handle here instead? | 
| +  if (create_code_object == CodeObjectRequired::kYes) { | 
| code_object_ = | 
| Handle<Object>::New(isolate()->heap()->undefined_value(), isolate()); | 
| } | 
| @@ -2663,7 +2663,7 @@ bool AreAliased(Register reg1, | 
| CodePatcher::CodePatcher(byte* address, int size) | 
| : address_(address), | 
| size_(size), | 
| -      masm_(NULL, address, size + Assembler::kGap) { | 
| +      masm_(NULL, address, size + Assembler::kGap, CodeObjectRequired::kNo) { | 
| // Create a new macro assembler pointing to the address of the code to patch. | 
| // The size is adjusted with kGap on order for the assembler to generate size | 
| // bytes of instructions without failing with buffer size constraints. | 
|  |