Experimental: for forward CFG edges, generate the code to merge to an...

src/codegen-ia32.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 1850 matching lines @@
   fail_label->Branch(greater_equal, not_taken);
 
   // 0 is placeholder.
   __ jmp(Operand(eax, eax, times_1, 0x0, RelocInfo::INTERNAL_REFERENCE));
   // calculate address to overwrite later with actual address of table.
   int32_t jump_table_ref = __ pc_offset() - sizeof(int32_t);
 
   __ Align(4);
   JumpTarget table_start(this);
   table_start.Bind();
-  __ WriteInternalReference(jump_table_ref, *table_start.label());
+  __ WriteInternalReference(jump_table_ref, *table_start.entry_label());
 
   for (int i = 0; i < range; i++) {
     // table entry, 0 is placeholder for case address
     __ dd(0x0, RelocInfo::INTERNAL_REFERENCE);
   }
 
   GenerateFastCaseSwitchCases(node, case_labels, &table_start);
 
-  for (int i = 0, entry_pos = table_start.label()->pos();
+  for (int i = 0, entry_pos = table_start.entry_label()->pos();
        i < range;
        i++, entry_pos += sizeof(uint32_t)) {
-    __ WriteInternalReference(entry_pos, *case_targets[i]->label());
+    __ WriteInternalReference(entry_pos, *case_targets[i]->entry_label());
   }
 }
 
 
 void CodeGenerator::VisitSwitchStatement(SwitchStatement* node) {
   ASSERT(!in_spilled_code());
   Comment cmnt(masm_, "[ SwitchStatement");
   CodeForStatement(node);
   node->set_break_stack_height(break_stack_height_);
   node->break_target()->set_code_generator(this);
@@ skipping 516 matching lines @@
   // We should probably try to unify the escaping targets and the return
   // target.
   int nof_escapes = node->escaping_targets()->length();
   List<ShadowTarget*> shadows(1 + nof_escapes);
 
   // Add the shadow target for the function return.
   static const int kReturnShadowIndex = 0;
   shadows.Add(new ShadowTarget(&function_return_));
   bool function_return_was_shadowed = function_return_is_shadowed_;
   function_return_is_shadowed_ = true;
-  ASSERT(shadows[kReturnShadowIndex]->original_target() == &function_return_);
+  ASSERT(shadows[kReturnShadowIndex]->other_target() == &function_return_);
 
   // Add the remaining shadow targets.
   for (int i = 0; i < nof_escapes; i++) {
     shadows.Add(new ShadowTarget(node->escaping_targets()->at(i)));
   }
 
   // Generate code for the statements in the try block.
   VisitStatementsAndSpill(node->try_block()->statements());
 
   // Stop the introduced shadowing and count the number of required unlinks.
@@ skipping 48 matching lines @@
       __ lea(esp, Operand(edx, kNextOffset));
       frame_->Forget(frame_->height() - handler_height);
 
       frame_->EmitPop(Operand::StaticVariable(handler_address));
       frame_->Drop(StackHandlerConstants::kSize / kPointerSize - 1);
       // next_sp popped.
 
       if (!function_return_is_shadowed_ && i == kReturnShadowIndex) {
         frame_->PrepareForReturn();
       }
-      shadows[i]->original_target()->Jump();
+      shadows[i]->other_target()->Jump();
     }
   }
 
   exit.Bind();
 }
 
 
 void CodeGenerator::VisitTryFinally(TryFinally* node) {
   ASSERT(!in_spilled_code());
   VirtualFrame::SpilledScope spilled_scope(this);
@@ skipping 31 matching lines @@
   // We should probably try to unify the escaping targets and the return
   // target.
   int nof_escapes = node->escaping_targets()->length();
   List<ShadowTarget*> shadows(1 + nof_escapes);
 
   // Add the shadow target for the function return.
   static const int kReturnShadowIndex = 0;
   shadows.Add(new ShadowTarget(&function_return_));
   bool function_return_was_shadowed = function_return_is_shadowed_;
   function_return_is_shadowed_ = true;
-  ASSERT(shadows[kReturnShadowIndex]->original_target() == &function_return_);
+  ASSERT(shadows[kReturnShadowIndex]->other_target() == &function_return_);
 
   // Add the remaining shadow targets.
   for (int i = 0; i < nof_escapes; i++) {
     shadows.Add(new ShadowTarget(node->escaping_targets()->at(i)));
   }
 
   // Generate code for the statements in the try block.
   VisitStatementsAndSpill(node->try_block()->statements());
 
   // Stop the introduced shadowing and count the number of required unlinks.
@@ skipping 76 matching lines @@
   if (has_valid_frame()) {
     JumpTarget exit(this);
     // Restore state and return value or faked TOS.
     frame_->EmitPop(ecx);
     frame_->EmitPop(eax);
 
     // Generate code to jump to the right destination for all used
     // formerly shadowing targets.
     for (int i = 0; i <= nof_escapes; i++) {
       if (shadows[i]->is_bound()) {
-        JumpTarget* original = shadows[i]->original_target();
+        JumpTarget* original = shadows[i]->other_target();
         __ cmp(Operand(ecx), Immediate(Smi::FromInt(JUMPING + i)));
         if (!function_return_is_shadowed_ && i == kReturnShadowIndex) {
           JumpTarget skip(this);
           skip.Branch(not_equal);
           frame_->PrepareForReturn();
           original->Jump();
           skip.Bind();
         } else {
           original->Branch(equal);
         }
@@ skipping 3495 matching lines @@
 
   // Slow-case: Go through the JavaScript implementation.
   __ bind(&slow);
   __ InvokeBuiltin(Builtins::INSTANCE_OF, JUMP_FUNCTION);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal