Fixed problem where popping a handle scope after calling an accessor

src/ia32/macro-assembler-ia32.cc

 // Copyright 2006-2009 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 955 matching lines @@
   // hence automatically smi tagged.
   ExternalReference next_address =
       ExternalReference::handle_scope_next_address();
   push(Operand::StaticVariable(next_address));
   ExternalReference limit_address =
       ExternalReference::handle_scope_limit_address();
   push(Operand::StaticVariable(limit_address));
 }
 
 
-void MacroAssembler::PopHandleScope(Register scratch) {
+void MacroAssembler::PopHandleScope(Vector<const Register> saved,

[Lasse Reichstein, 2009/11/06 11:23:32]

You are only ever using this with one register. Is it needless generality?
Could you pass a bit-vector instead of a Vector, so that anyone passing more
than one register won't have to create an array?

[Christian Plesner Hansen, 2009/11/06 11:33:07]

Fixed

+                                    Register scratch) {
   ExternalReference extensions_address =
         ExternalReference::handle_scope_extensions_address();
   Label write_back;
   mov(scratch, Operand::StaticVariable(extensions_address));
   cmp(Operand(scratch), Immediate(0));
   j(equal, &write_back);
+  // Calling a runtime function messes with registers so we save and
+  // restore the ones we're asked not to change.
+  for (int i = 0; i < saved.length(); i++)
+    push(saved[i]);

[Lasse Reichstein, 2009/11/06 11:23:32]

Put on the same line as the for, or use curly brackets.

[Christian Plesner Hansen, 2009/11/06 11:33:07]

Fixed

   CallRuntime(Runtime::kDeleteHandleScopeExtensions, 0);
+  for (int i = 0; i < saved.length(); i++)
+    pop(saved[i]);

[Lasse Reichstein, 2009/11/06 11:23:32]

Shouldn't you be popping them in reverse order?
And same line or curly brackets again.

[Christian Plesner Hansen, 2009/11/06 11:33:07]

Whoops!  Fixed.

 
   bind(&write_back);
   ExternalReference limit_address =
         ExternalReference::handle_scope_limit_address();
   pop(Operand::StaticVariable(limit_address));
   ExternalReference next_address =
         ExternalReference::handle_scope_next_address();
   pop(Operand::StaticVariable(next_address));
   pop(scratch);
   shr(scratch, kSmiTagSize);
@@ skipping 275 matching lines @@
   // Indicate that code has changed.
   CPU::FlushICache(address_, size_);
 
   // Check that the code was patched as expected.
   ASSERT(masm_.pc_ == address_ + size_);
   ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
 }
 
 
 } }  // namespace v8::internal