Adapt compile time constants and integrate with Kevin's CL 10302007 (Remove temporaries using expli…

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
@@ skipping 382 matching lines @@
     if (FLAG_enable_type_checks) {
       BindInstr* assert_boolean =
           new BindInstr(new AssertBooleanComp(node->right()->token_index(),
                                               owner()->try_index(),
                                               right_value));
       for_right.AddInstruction(assert_boolean);
       right_value = new UseVal(assert_boolean);
     }
     BindInstr* constant_true = new BindInstr(new ConstantVal(bool_true));
     for_right.AddInstruction(constant_true);
-    StrictCompareComp* comp = new StrictCompareComp(Token::kEQ_STRICT,
-        right_value, new UseVal(constant_true));
-    for_right.AddInstruction(new BindInstr(comp));
+    BindInstr* comp =
+        new BindInstr(new StrictCompareComp(Token::kEQ_STRICT,
+                                            right_value,
+                                            new UseVal(constant_true)));
+    for_right.AddInstruction(comp);
+    for_right.AddInstruction(
+        new DoInstr(new StoreLocalComp(
+            *owner()->parsed_function().expression_temp_var(),
+            new UseVal(comp),
+            owner()->context_level())));
 
     if (node->kind() == Token::kAND) {
       ValueGraphVisitor for_false(owner(), temp_index());
-      for_false.ReturnComputation(new ConstantVal(bool_false));
+      BindInstr* constant_false = new BindInstr(new ConstantVal(bool_false));
+      for_false.AddInstruction(constant_false);
+      for_false.AddInstruction(
+          new DoInstr(new StoreLocalComp(
+              *owner()->parsed_function().expression_temp_var(),
+              new UseVal(constant_false),
+              owner()->context_level())));
       Join(for_test, for_right, for_false);
     } else {
       ASSERT(node->kind() == Token::kOR);
       ValueGraphVisitor for_true(owner(), temp_index());
-      for_true.ReturnComputation(new ConstantVal(bool_true));
+      BindInstr* constant_true = new BindInstr(new ConstantVal(bool_true));
+      for_true.AddInstruction(constant_true);
+      for_true.AddInstruction(
+          new DoInstr(new StoreLocalComp(
+              *owner()->parsed_function().expression_temp_var(),
+              new UseVal(constant_true),
+              owner()->context_level())));
       Join(for_test, for_true, for_right);
     }
-    ReturnValue(new TempVal(temp_index() - 1));
+    ReturnComputation(
+        new LoadLocalComp(*owner()->parsed_function().expression_temp_var(),
+                          owner()->context_level()));
     return;
   }
   EffectGraphVisitor::VisitBinaryOpNode(node);
 }
 
 
 void EffectGraphVisitor::CompiletimeStringInterpolation(
     const Function& interpol_func, const Array& literals) {
   // Do nothing.
 }
@@ skipping 311 matching lines @@
   Join(for_test, for_true, for_false);
 }
 
 
 void ValueGraphVisitor::VisitConditionalExprNode(ConditionalExprNode* node) {
   TestGraphVisitor for_test(owner(),
                             temp_index(),
                             node->condition()->token_index());
   node->condition()->Visit(&for_test);
 
-  // Ensure that the value of the true/false subexpressions are named with
-  // the same temporary name.
   ValueGraphVisitor for_true(owner(), temp_index());
   node->true_expr()->Visit(&for_true);
   ASSERT(for_true.is_open());
-  ASSERT(for_true.value()->IsTemp() || for_true.value()->IsUse());
+  for_true.AddInstruction(
+      new DoInstr(
+          new StoreLocalComp(*owner()->parsed_function().expression_temp_var(),
+                             for_true.value(),
+                             owner()->context_level())));
 
   ValueGraphVisitor for_false(owner(), temp_index());
   node->false_expr()->Visit(&for_false);
   ASSERT(for_false.is_open());
-  ASSERT(for_false.value()->IsTemp() || for_false.value()->IsUse());
+  for_false.AddInstruction(
+      new DoInstr(
+          new StoreLocalComp(*owner()->parsed_function().expression_temp_var(),
+                             for_false.value(),
+                             owner()->context_level())));
 
   Join(for_test, for_true, for_false);
-  ReturnValue(new TempVal(temp_index() - 1));
+  ReturnComputation(
+      new LoadLocalComp(*owner()->parsed_function().expression_temp_var(),
+                        owner()->context_level()));
 }
 
 
 // <Statement> ::= If { condition: <Expression>
 //                      true_branch: <Sequence>
 //                      false_branch: <Sequence> }
 void EffectGraphVisitor::VisitIfNode(IfNode* node) {
   TestGraphVisitor for_test(owner(),
                             temp_index(),
                             node->condition()->token_index());
@@ skipping 1305 matching lines @@
       // For readability label blocks with their reverse postorder index,
       // not their postorder block number, so the first block is 0 (not
       // n-1).
       OS::Print(" goto %d", reverse_index(successor->postorder_number()));
     }
     OS::Print("\n");
   }
 }
 
 
-void FlowGraphPrinter::VisitTemp(TempVal* val) {
-  OS::Print("t%d", val->index());
-}
-
-
 void FlowGraphPrinter::VisitUse(UseVal* val) {
-  OS::Print("s%d", val->definition()->temp_index());
+  OS::Print("t%d", val->definition()->temp_index());
 }
 
 
 void FlowGraphPrinter::VisitConstant(ConstantVal* val) {
   OS::Print("#%s", val->value().ToCString());
 }
 
 
 void FlowGraphPrinter::VisitAssertAssignable(AssertAssignableComp* comp) {
   OS::Print("AssertAssignable(");
@@ skipping 490 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart