Revision: 23636
Author:   [email protected]
Date:     Wed Sep  3 08:49:21 2014 UTC
Log:      [turbofan] Finish nodes are always marked as references.

TEST=compiler-unittests,cctest
[email protected]

Review URL: https://codereview.chromium.org/533083002
https://code.google.com/p/v8/source/detail?r=23636

Modified:
 /branches/bleeding_edge/src/compiler/instruction-selector-unittest.cc
 /branches/bleeding_edge/src/compiler/instruction-selector.cc

=======================================
--- /branches/bleeding_edge/src/compiler/instruction-selector-unittest.cc Tue Sep 2 11:28:40 2014 UTC +++ /branches/bleeding_edge/src/compiler/instruction-selector-unittest.cc Wed Sep 3 08:49:21 2014 UTC
@@ -178,13 +178,8 @@
 // Finish.


-typedef InstructionSelectorTestWithParam<MachineType>
-    InstructionSelectorFinishTest;
-
-
-TARGET_TEST_P(InstructionSelectorFinishTest, Parameter) {
-  const MachineType type = GetParam();
-  StreamBuilder m(this, type, type);
+TARGET_TEST_F(InstructionSelectorTest, Parameter) {
+  StreamBuilder m(this, kMachAnyTagged, kMachAnyTagged);
   Node* param = m.Parameter(0);
Node* finish = m.NewNode(m.common()->Finish(1), param, m.graph()->start());
   m.Return(finish);
@@ -205,37 +200,8 @@
 }


-TARGET_TEST_P(InstructionSelectorFinishTest, PropagateDoubleness) {
-  const MachineType type = GetParam();
-  StreamBuilder m(this, type, type);
-  Node* param = m.Parameter(0);
- Node* finish = m.NewNode(m.common()->Finish(1), param, m.graph()->start());
-  m.Return(finish);
-  Stream s = m.Build(kAllInstructions);
-  EXPECT_EQ(s.IsDouble(param->id()), s.IsDouble(finish->id()));
-}
-
-
-TARGET_TEST_P(InstructionSelectorFinishTest, PropagateReferenceness) {
-  const MachineType type = GetParam();
-  StreamBuilder m(this, type, type);
-  Node* param = m.Parameter(0);
- Node* finish = m.NewNode(m.common()->Finish(1), param, m.graph()->start());
-  m.Return(finish);
-  Stream s = m.Build(kAllInstructions);
-  EXPECT_EQ(s.IsReference(param->id()), s.IsReference(finish->id()));
-}
-
-
-INSTANTIATE_TEST_CASE_P(InstructionSelectorTest, InstructionSelectorFinishTest, - ::testing::Values(kMachFloat64, kMachInt8, kMachUint8, - kMachInt16, kMachUint16, kMachInt32, - kMachUint32, kMachInt64, kMachUint64,
-                                          kMachPtr, kMachAnyTagged));
-
-
// -----------------------------------------------------------------------------
-// Finish.
+// Phi.


 typedef InstructionSelectorTestWithParam<MachineType>
=======================================
--- /branches/bleeding_edge/src/compiler/instruction-selector.cc Tue Sep 2 11:28:40 2014 UTC +++ /branches/bleeding_edge/src/compiler/instruction-selector.cc Wed Sep 3 08:49:21 2014 UTC
@@ -199,11 +199,10 @@
   DCHECK(!IsReference(node));
   sequence()->MarkAsDouble(node->id());

-  // Propagate "doubleness" throughout Finish/Phi nodes.
+  // Propagate "doubleness" throughout Phi nodes.
   for (UseIter i = node->uses().begin(); i != node->uses().end(); ++i) {
     Node* user = *i;
     switch (user->opcode()) {
-      case IrOpcode::kFinish:
       case IrOpcode::kPhi:
         if (IsDouble(user)) continue;
         MarkAsDouble(user);
@@ -226,11 +225,10 @@
   DCHECK(!IsDouble(node));
   sequence()->MarkAsReference(node->id());

-  // Propagate "referenceness" throughout Finish/Phi nodes.
+  // Propagate "referenceness" throughout Phi nodes.
   for (UseIter i = node->uses().begin(); i != node->uses().end(); ++i) {
     Node* user = *i;
     switch (user->opcode()) {
-      case IrOpcode::kFinish:
       case IrOpcode::kPhi:
         if (IsReference(user)) continue;
         MarkAsReference(user);
@@ -482,7 +480,7 @@
       // No code needed for these graph artifacts.
       return;
     case IrOpcode::kFinish:
-      return VisitFinish(node);
+      return MarkAsReference(node), VisitFinish(node);
     case IrOpcode::kParameter: {
       LinkageLocation location =
           linkage()->GetParameterLocation(OpParameter<int>(node));

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to