Simplfy handling of exits from scoped blocks.

src/full-codegen.h

 // Copyright 2011 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 173 matching lines @@
     virtual bool IsContinueTarget(Statement* target) {
       return statement() == target;
     }
 
     Label* continue_label() { return &continue_label_; }
 
    private:
     Label continue_label_;
   };
 
+  // A nested block statement.
+  class NestedBlock : public Breakable {
+   public:
+    explicit NestedBlock(FullCodeGenerator* codegen, Block* block)

[Kevin Millikin (Chromium), 2011/09/02 15:17:44]

No need for explicit for two argument constructors.

[Steven, 2011/09/05 08:54:50]

Done.

+        : Breakable(codegen, block), block_(block) {
+    }
+    virtual ~NestedBlock() {}
+
+    virtual NestedStatement* Exit(int* stack_depth, int* context_length) {
+      if (block_->block_scope() != NULL) {
+        ++(*context_length);
+      }
+      return previous_;
+    };
+   private:
+    Block* block_;

[Kevin Millikin (Chromium), 2011/09/02 15:17:44]

This class doesn't need to store the block since the base class does.  You
probably will just need a cast:

virtual NestedStatement* Exit(int* stack_depth, int* context_length) {
  if (statement()->AsBlock()->block_scope() != NULL) ...

[Steven, 2011/09/05 08:54:50]

Done.

+  };
+
   // The try block of a try/catch statement.
   class TryCatch : public NestedStatement {
    public:
     explicit TryCatch(FullCodeGenerator* codegen) : NestedStatement(codegen) {
     }
     virtual ~TryCatch() {}
 
     virtual NestedStatement* Exit(int* stack_depth, int* context_length);
   };
 
@@ skipping 600 matching lines @@
 
   friend class NestedStatement;
 
   DISALLOW_COPY_AND_ASSIGN(FullCodeGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FULL_CODEGEN_H_