Fix some asserts in stub generation and file some bugs where

src/macro-assembler.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.

[Jakob Kummerow, 2011/09/15 15:41:09]

2011

 // 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
 //       with the distribution.
@@ skipping 77 matching lines @@
 #else
 #error Unsupported target architecture.
 #endif
 
 namespace v8 {
 namespace internal {
 
 class FrameScope {
  public:
   explicit FrameScope(MacroAssembler* masm, StackFrame::Type type)
-      : masm_(masm), type_(type) {
-    ASSERT(!masm->has_frame());
+      : masm_(masm), type_(type), old_has_frame_(masm->has_frame()) {
     masm->set_has_frame(true);
     if (type != StackFrame::MANUAL && type_ != StackFrame::NONE) {
       masm->EnterFrame(type);
     }
   }
 
   ~FrameScope() {
     if (type_ != StackFrame::MANUAL && type_ != StackFrame::NONE) {
       masm_->LeaveFrame(type_);
     }
-    masm_->set_has_frame(false);
+    masm_->set_has_frame(old_has_frame_);
   }
 
   // Normally we generate the leave-frame code when this object goes
   // out of scope.  Sometimes we may need to generate the code somewhere else
   // in addition.  Calling this will achieve that, but the object stays in
   // scope, the MacroAssembler is still marked as being in a frame scope, and
   // the code will be generated again when it goes out of scope.
   void GenerateLeaveFrame() {
     masm_->LeaveFrame(type_);
   }
 
  private:
   MacroAssembler* masm_;
   StackFrame::Type type_;
+  bool old_has_frame_;
 };
 
 
 class AllowExternalCallThatCantCauseGC: public FrameScope {
  public:
   explicit AllowExternalCallThatCantCauseGC(MacroAssembler* masm)
       : FrameScope(masm, StackFrame::NONE) { }
 };
 
 
@@ skipping 32 matching lines @@
 class Comment {
  public:
   Comment(MacroAssembler*, const char*)  {}
 };
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal
 
 #endif  // V8_MACRO_ASSEMBLER_H_