Ensure deallocation of the dynamically allocated shadow targets used...

src/codegen-arm.cc

 // Copyright 2006-2008 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 2242 matching lines @@
   // Push the state on the stack.
   frame_->EmitPush(r2);
 
   // We keep two elements on the stack - the (possibly faked) result
   // and the state - while evaluating the finally block.
   //
   // Generate code for the statements in the finally block.
   VisitStatementsAndSpill(node->finally_block()->statements());
 
   if (has_valid_frame()) {
-    JumpTarget exit(this);
     // Restore state and return value or faked TOS.
     frame_->EmitPop(r2);
     frame_->EmitPop(r0);
+  }
 
-    // Generate code to jump to the right destination for all used
-    // formerly shadowing targets.  Deallocate each shadow target.
-    for (int i = 0; i < shadows.length(); i++) {
-      if (shadows[i]->is_bound()) {
-        JumpTarget* original = shadows[i]->other_target();
-        __ cmp(r2, Operand(Smi::FromInt(JUMPING + i)));
-        if (!function_return_is_shadowed_ && i == kReturnShadowIndex) {
-          JumpTarget skip(this);
-          skip.Branch(ne);
-          frame_->PrepareForReturn();
-          original->Jump();
-          skip.Bind();
-        } else {
-          original->Branch(eq);
-        }
+  // Generate code to jump to the right destination for all used
+  // formerly shadowing targets.  Deallocate each shadow target.
+  for (int i = 0; i < shadows.length(); i++) {
+    if (has_valid_frame() && shadows[i]->is_bound()) {
+      JumpTarget* original = shadows[i]->other_target();
+      __ cmp(r2, Operand(Smi::FromInt(JUMPING + i)));
+      if (!function_return_is_shadowed_ && i == kReturnShadowIndex) {
+        JumpTarget skip(this);
+        skip.Branch(ne);
+        frame_->PrepareForReturn();
+        original->Jump();
+        skip.Bind();
+      } else {
+        original->Branch(eq);
       }
-      delete shadows[i];
     }
+    delete shadows[i];
+  }
 
+  if (has_valid_frame()) {
     // Check if we need to rethrow the exception.
+    JumpTarget exit(this);
     __ cmp(r2, Operand(Smi::FromInt(THROWING)));
     exit.Branch(ne);
 
     // Rethrow exception.
     frame_->EmitPush(r0);
     frame_->CallRuntime(Runtime::kReThrow, 1);
 
     // Done.
     exit.Bind();
   }
@@ skipping 2850 matching lines @@
   __ mov(r2, Operand(0));
   __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
   __ Jump(Handle<Code>(Builtins::builtin(Builtins::ArgumentsAdaptorTrampoline)),
           RelocInfo::CODE_TARGET);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal