Chromium Code Reviews| Index: runtime/vm/code_generator_ia32.cc |
| diff --git a/runtime/vm/code_generator_ia32.cc b/runtime/vm/code_generator_ia32.cc |
| index 66a6327a53cdf7e62b128a308b8cb91fe4cfe130..4a2d99b9db4aacfdac6f7035808b656a8f7bf82d 100644 |
| --- a/runtime/vm/code_generator_ia32.cc |
| +++ b/runtime/vm/code_generator_ia32.cc |
| @@ -861,13 +861,15 @@ void CodeGenerator::VisitSequenceNode(SequenceNode* node_sequence) { |
| (parsed_function_.saved_context_var() != NULL)) { |
| GenerateStoreVariable( |
| *parsed_function_.saved_context_var(), CTX, kNoRegister); |
| - const Immediate raw_null = |
| - Immediate(reinterpret_cast<intptr_t>(Object::null())); |
| - __ movl(CTX, raw_null); |
| + const Object& raw_null = Object::ZoneHandle(Object::null()); |
|
srdjan
2012/06/15 21:10:34
Object::ZoneHandle() is enough to get null handle.
|
| + __ StoreIntoObjectNoBarrier(EAX, |
| + FieldAddress(EAX, Context::parent_offset()), |
| + raw_null); |
| + } else { |
| + // Chain the new context in EAX to its parent in CTX. |
| + __ StoreIntoObject(EAX, FieldAddress(EAX, Context::parent_offset()), CTX); |
| } |
| - // Chain the new context in EAX to its parent in CTX. |
| - __ StoreIntoObject(EAX, FieldAddress(EAX, Context::parent_offset()), CTX); |
| // Set new context as current context. |
| __ movl(CTX, EAX); |
| set_context_level(scope->context_level()); |