Provisional implementation of stack allocated catch variables.

src/full-codegen.cc

 // 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 83 matching lines @@
     EnterWithContextStatement* stmt) {
   Visit(stmt->expression());
 }
 
 
 void BreakableStatementChecker::VisitExitContextStatement(
     ExitContextStatement* stmt) {
 }
 
 
+void BreakableStatementChecker::VisitExitScopedBlockStatement(
+    ExitScopedBlockStatement* stmt) {
+}
+
+
 void BreakableStatementChecker::VisitSwitchStatement(SwitchStatement* stmt) {
   // Switch statements breakable if the tag expression is.
   Visit(stmt->tag());
 }
 
 
 void BreakableStatementChecker::VisitDoWhileStatement(DoWhileStatement* stmt) {
   // Mark do while as breakable to avoid adding a break slot in front of it.
   is_breakable_ = true;
 }
@@ skipping 854 matching lines @@
   Comment cmnt(masm_, "[ ExitContextStatement");
   SetStatementPosition(stmt);
 
   // Pop context.
   LoadContextField(context_register(), Context::PREVIOUS_INDEX);
   // Update local stack frame context field.
   StoreToFrameField(StandardFrameConstants::kContextOffset, context_register());
 }
 
 
+void FullCodeGenerator::VisitExitScopedBlockStatement(
+    ExitScopedBlockStatement* stmt) {
+  Comment cmnt(masm_, "[ ExitScopedBlockStatement");
+  SetStatementPosition(stmt);
+
+  if (scope()->num_heap_slots() > 0) {
+    // Pop context.
+    LoadContextField(context_register(), Context::PREVIOUS_INDEX);
+    // Update local stack frame context field.
+    StoreToFrameField(StandardFrameConstants::kContextOffset,
+                      context_register());
+  }
+}
+
+
 void FullCodeGenerator::VisitDoWhileStatement(DoWhileStatement* stmt) {
   Comment cmnt(masm_, "[ DoWhileStatement");
   SetStatementPosition(stmt);
   Label body, stack_check;
 
   Iteration loop_statement(this, stmt);
   increment_loop_depth();
 
   __ bind(&body);
   Visit(stmt->body());
@@ skipping 111 matching lines @@
   // At this point, the exception is in a register, and store it in
   // the temporary local variable (prints as ".catch-var") before
   // executing the catch block. The catch block has been rewritten
   // to introduce a new scope to bind the catch variable and to remove
   // that scope again afterwards.
 
   Label try_handler_setup, catch_entry, done;
   __ Call(&try_handler_setup);
   // Try handler code, exception in result register.
 
-  // Extend the context before executing the catch block.
-  { Comment cmnt(masm_, "[ Extend catch context");
+  if (stmt->scope()->num_heap_slots() > 0) {
+    // Extend the context before executing the catch block.
+    Comment cmnt(masm_, "[ Extend catch context");
     __ Push(stmt->variable()->name());
     __ push(result_register());
     PushFunctionArgumentForContextAllocation();
     __ CallRuntime(Runtime::kPushCatchContext, 3);
     StoreToFrameField(StandardFrameConstants::kContextOffset,
                       context_register());
+  } else {
+    // Assign exception value to the stack allocated catch variable.
+    EmitVariableAssignment(stmt->variable(), Token::ASSIGN);
   }
 
   Scope* saved_scope = scope();
   scope_ = stmt->scope();
   ASSERT(scope_->declarations()->is_empty());
   Visit(stmt->catch_block());
   scope_ = saved_scope;
   __ jmp(&done);
 
   // Try block code. Sets up the exception handler chain.
@@ skipping 188 matching lines @@
   }
 
   return false;
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal