Fix finally clause inlining for forward jumps

runtime/vm/scopes.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/scopes.h"
 
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 80 matching lines @@
   labels_.Add(label);
   if (label->owner() == NULL) {
     // Labels must be added to their owner scope first. Subsequent calls
     // to 'add' treat the label as an alias.
     label->set_owner(this);
   }
   return true;
 }
 
 
+void LocalScope::MoveLabel(SourceLabel* label) {
+  ASSERT(LocalLookupLabel(label->name()) == NULL);
+  ASSERT(label->kind() == SourceLabel::kForward);
+  labels_.Add(label);
+  label->set_owner(this);
+}
+
+
 NameReference* LocalScope::FindReference(const String& name) const {
   ASSERT(name.IsSymbol());
   intptr_t num_references = referenced_.length();
   for (intptr_t i = 0; i < num_references; i++) {
     if (name.raw() == referenced_[i]->name().raw()) {
       return referenced_[i];
     }
   }
   return NULL;
 }
@@ skipping 371 matching lines @@
 
 
 SourceLabel* LocalScope::CheckUnresolvedLabels() {
   for (int i = 0; i < this->labels_.length(); i++) {
     SourceLabel* label = this->labels_[i];
     if (label->kind() == SourceLabel::kForward) {
       LocalScope* outer_switch = LookupSwitchScope();
       if (outer_switch == NULL) {
         return label;
       } else {
-        outer_switch->AddLabel(label);
+        outer_switch->MoveLabel(label);
       }
     }
   }
   return NULL;
 }
 
 
 int LocalScope::NumCapturedVariables() const {
   // It is not necessary to traverse parent scopes, since we are only interested
   // in the captured variables referenced in this scope. If this scope is the
@@ skipping 165 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart