[Isolates] Merge crankshaft (r5922 from bleeding_edge).

src/rewriter.cc

 // Copyright 2010 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 204 matching lines @@
 
 
 void AstOptimizer::VisitConditional(Conditional* node) {
   node->condition()->set_no_negative_zero(true);
   Visit(node->condition());
   Visit(node->then_expression());
   Visit(node->else_expression());
 }
 
 
-void AstOptimizer::VisitSlot(Slot* node) {
-  USE(node);
-}
-
-
 void AstOptimizer::VisitVariableProxy(VariableProxy* node) {
   Variable* var = node->AsVariable();
   if (var != NULL) {
     if (var->type()->IsKnown()) {
       node->type()->CopyFrom(var->type());
     } else if (node->type()->IsLikelySmi()) {
       var->type()->SetAsLikelySmi();
     }
 
     if (FLAG_safe_int32_compiler) {
@@ skipping 439 matching lines @@
 }
 
 
 void AstOptimizer::VisitThisFunction(ThisFunction* node) {
   USE(node);
 }
 
 
 class Processor: public AstVisitor {
  public:
-  explicit Processor(VariableProxy* result)
+  explicit Processor(Variable* result)
       : result_(result),
         result_assigned_(false),
         is_set_(false),
         in_try_(false) {
   }
 
   void Process(ZoneList<Statement*>* statements);
   bool result_assigned() const { return result_assigned_; }
 
  private:
-  VariableProxy* result_;
+  Variable* result_;
 
   // We are not tracking result usage via the result_'s use
   // counts (we leave the accurate computation to the
   // usage analyzer). Instead we simple remember if
   // there was ever an assignment to result_.
   bool result_assigned_;
 
   // To avoid storing to .result all the time, we eliminate some of
   // the stores by keeping track of whether or not we're sure .result
   // will be overwritten anyway. This is a bit more tricky than what I
   // was hoping for
   bool is_set_;
   bool in_try_;
 
   Expression* SetResult(Expression* value) {
     result_assigned_ = true;
-    return new Assignment(Token::ASSIGN, result_, value,
+    VariableProxy* result_proxy = new VariableProxy(result_);
+    return new Assignment(Token::ASSIGN, result_proxy, value,
                           RelocInfo::kNoPosition);
   }
 
   // Node visitors.
 #define DEF_VISIT(type) \
   virtual void Visit##type(type* node);
   AST_NODE_LIST(DEF_VISIT)
 #undef DEF_VISIT
 
   void VisitIterationStatement(IterationStatement* stmt);
@@ skipping 134 matching lines @@
   UNREACHABLE();
 }
 
 
 void Processor::VisitConditional(Conditional* node) {
   USE(node);
   UNREACHABLE();
 }
 
 
-void Processor::VisitSlot(Slot* node) {
-  USE(node);
-  UNREACHABLE();
-}
-
-
 void Processor::VisitVariableProxy(VariableProxy* node) {
   USE(node);
   UNREACHABLE();
 }
 
 
 void Processor::VisitLiteral(Literal* node) {
   USE(node);
   UNREACHABLE();
 }
@@ skipping 104 matching lines @@
 // AST, so the AST should not continue to be used in the case of failure.
 bool Rewriter::Rewrite(CompilationInfo* info) {
   FunctionLiteral* function = info->function();
   ASSERT(function != NULL);
   Scope* scope = function->scope();
   ASSERT(scope != NULL);
   if (scope->is_function_scope()) return true;
 
   ZoneList<Statement*>* body = function->body();
   if (!body->is_empty()) {
-    VariableProxy* result = scope->NewTemporary(
+    Variable* result = scope->NewTemporary(
         info->isolate()->factory()->result_symbol());
     Processor processor(result);
     processor.Process(body);
     if (processor.HasStackOverflow()) return false;
 
-    if (processor.result_assigned()) body->Add(new ReturnStatement(result));
+    if (processor.result_assigned()) {
+      VariableProxy* result_proxy = new VariableProxy(result);
+      body->Add(new ReturnStatement(result_proxy));
+    }
   }
 
   return true;
 }
 
 
 // Assumes code has been parsed and scopes have been analyzed.  Mutates the
 // AST, so the AST should not continue to be used in the case of failure.
 bool Rewriter::Analyze(CompilationInfo* info) {
   FunctionLiteral* function = info->function();
   ASSERT(function != NULL && function->scope() != NULL);
 
   ZoneList<Statement*>* body = function->body();
   if (FLAG_optimize_ast && !body->is_empty()) {
     AstOptimizer optimizer;
     optimizer.Optimize(body);
     if (optimizer.HasStackOverflow()) return false;
   }
   return true;
 }
 
 
 } }  // namespace v8::internal