Revision: 8385
Author:   [email protected]
Date:     Wed Jun 22 23:26:50 2011
Log:      HBasicBlock::CreateSimulate argument name clarity

* src/hydrogen.h:
* src/hydrogen.cc (HBasicBlock::CreateSimulate): Rename "id" arg to
  "ast_id".

BUG=
TEST=

Review URL: http://codereview.chromium.org/7234010
Patch from Andy Wingo <[email protected]>.
http://code.google.com/p/v8/source/detail?r=8385

Modified:
 /branches/bleeding_edge/src/hydrogen.cc
 /branches/bleeding_edge/src/hydrogen.h

=======================================
--- /branches/bleeding_edge/src/hydrogen.cc     Tue Jun 21 04:18:15 2011
+++ /branches/bleeding_edge/src/hydrogen.cc     Wed Jun 22 23:26:50 2011
@@ -131,7 +131,7 @@
 }


-HSimulate* HBasicBlock::CreateSimulate(int id) {
+HSimulate* HBasicBlock::CreateSimulate(int ast_id) {
   ASSERT(HasEnvironment());
   HEnvironment* environment = last_environment();
   ASSERT(id == AstNode::kNoNumber ||
@@ -140,7 +140,7 @@
   int push_count = environment->push_count();
   int pop_count = environment->pop_count();

-  HSimulate* instr = new(zone()) HSimulate(id, pop_count);
+  HSimulate* instr = new(zone()) HSimulate(ast_id, pop_count);
   for (int i = push_count - 1; i >= 0; --i) {
     instr->AddPushedValue(environment->ExpressionStackAt(i));
   }
@@ -194,7 +194,7 @@
 }


-void HBasicBlock::SetJoinId(int id) {
+void HBasicBlock::SetJoinId(int ast_id) {
   int length = predecessors_.length();
   ASSERT(length > 0);
   for (int i = 0; i < length; i++) {
@@ -204,8 +204,8 @@
     // We only need to verify the ID once.
     ASSERT(i != 0 ||
            predecessor->last_environment()->closure()->shared()
-               ->VerifyBailoutId(id));
-    simulate->set_ast_id(id);
+               ->VerifyBailoutId(ast_id));
+    simulate->set_ast_id(ast_id);
   }
 }

@@ -2328,9 +2328,9 @@
 }


-void HGraphBuilder::AddSimulate(int id) {
+void HGraphBuilder::AddSimulate(int ast_id) {
   ASSERT(current_block() != NULL);
-  current_block()->AddSimulate(id);
+  current_block()->AddSimulate(ast_id);
 }


=======================================
--- /branches/bleeding_edge/src/hydrogen.h      Tue Jun 21 04:18:15 2011
+++ /branches/bleeding_edge/src/hydrogen.h      Wed Jun 22 23:26:50 2011
@@ -116,14 +116,14 @@

   bool HasParentLoopHeader() const { return parent_loop_header_ != NULL; }

-  void SetJoinId(int id);
+  void SetJoinId(int ast_id);

   void Finish(HControlInstruction* last);
   void FinishExit(HControlInstruction* instruction);
   void Goto(HBasicBlock* block, bool include_stack_check = false);

   int PredecessorIndexOf(HBasicBlock* predecessor) const;
-  void AddSimulate(int id) { AddInstruction(CreateSimulate(id)); }
+  void AddSimulate(int ast_id) { AddInstruction(CreateSimulate(ast_id)); }
   void AssignCommonDominator(HBasicBlock* other);

   void FinishExitWithDeoptimization(HDeoptimize::UseEnvironment has_uses) {
@@ -156,7 +156,7 @@
   void RegisterPredecessor(HBasicBlock* pred);
   void AddDominatedBlock(HBasicBlock* block);

-  HSimulate* CreateSimulate(int id);
+  HSimulate* CreateSimulate(int ast_id);
   HDeoptimize* CreateDeoptimize(HDeoptimize::UseEnvironment has_uses);

   int block_id_;
@@ -694,7 +694,7 @@

   // Adding instructions.
   HInstruction* AddInstruction(HInstruction* instr);
-  void AddSimulate(int id);
+  void AddSimulate(int ast_id);

   // Bailout environment manipulation.
   void Push(HValue* value) { environment()->Push(value); }

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to