Fix some asserts in stub generation and file some bugs where

src/macro-assembler.h

Index: src/macro-assembler.h
===================================================================
--- src/macro-assembler.h	(revision 9297)
+++ src/macro-assembler.h	(working copy)
@@ -96,8 +96,7 @@
 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);
@@ -108,7 +107,7 @@
     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
@@ -123,6 +122,7 @@
  private:
   MacroAssembler* masm_;
   StackFrame::Type type_;
+  bool old_has_frame_;
 };