Merge revisions 3777-3813 from bleding_edge to partial snapshots ...

src/data-flow.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 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "v8.h"
 
 #include "data-flow.h"
 
 namespace v8 {
 namespace internal {
 
 
-void AstLabeler::Label(FunctionLiteral* fun) {
-  VisitStatements(fun->body());
+void AstLabeler::Label(CompilationInfo* info) {
+  info_ = info;
+  VisitStatements(info_->function()->body());
 }
 
 
 void AstLabeler::VisitStatements(ZoneList<Statement*>* stmts) {
   for (int i = 0, len = stmts->length(); i < len; i++) {
     Visit(stmts->at(i));
   }
 }
 
 
@@ skipping 107 matching lines @@
 }
 
 
 void AstLabeler::VisitSlot(Slot* expr) {
   UNREACHABLE();
 }
 
 
 void AstLabeler::VisitVariableProxy(VariableProxy* expr) {
   expr->set_num(next_number_++);
+  Variable* var = expr->var();
+  if (var->is_global() && !var->is_this()) {
+    info_->set_has_globals(true);
+  }
 }
 
 
 void AstLabeler::VisitLiteral(Literal* expr) {
   UNREACHABLE();
 }
 
 
 void AstLabeler::VisitRegExpLiteral(RegExpLiteral* expr) {
   UNREACHABLE();
@@ skipping 16 matching lines @@
 }
 
 
 void AstLabeler::VisitAssignment(Assignment* expr) {
   Property* prop = expr->target()->AsProperty();
   ASSERT(prop != NULL);
   if (prop != NULL) {
     ASSERT(prop->key()->IsPropertyName());
     VariableProxy* proxy = prop->obj()->AsVariableProxy();
     if (proxy != NULL && proxy->var()->is_this()) {
-      has_this_properties_ = true;
+      info()->set_has_this_properties(true);
     } else {
       Visit(prop->obj());
     }
   }
   Visit(expr->value());
   expr->set_num(next_number_++);
 }
 
 
 void AstLabeler::VisitThrow(Throw* expr) {
@@ skipping 46 matching lines @@
 void AstLabeler::VisitThisFunction(ThisFunction* expr) {
   UNREACHABLE();
 }
 
 
 void AstLabeler::VisitDeclaration(Declaration* decl) {
   UNREACHABLE();
 }
 
 } }  // namespace v8::internal