Restructure to support recursive invocation of the CFG builder. Add...

src/compiler.cc

 // Copyright 2009 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 62 matching lines @@
 #endif
 
   // Optimize the AST.
   if (!Rewriter::Optimize(literal)) {
     // Signal a stack overflow by returning a null handle.  The stack
     // overflow exception will be thrown by the caller.
     return Handle<Code>::null();
   }
 
   if (FLAG_multipass) {
-    Cfg* cfg = Cfg::Build(literal);
+    CfgGlobals scope(literal);
+    Cfg* cfg = Cfg::Build();
 #ifdef DEBUG
     if (FLAG_print_cfg && cfg != NULL) {
       SmartPointer<char> name = literal->name()->ToCString();
       PrintF("Function \"%s\":\n", *name);
       cfg->Print();
       PrintF("\n");
     }
 #endif
     if (cfg != NULL) {
-      return cfg->Compile(literal, script);
+      return cfg->Compile(script);
     }
   }
 
   // Generate code and return it.
   Handle<Code> result = CodeGenerator::MakeCode(literal, script, is_eval);
   return result;
 }
 
 
 static bool IsValidJSON(FunctionLiteral* lit) {
@@ skipping 312 matching lines @@
   // Set the expected number of properties for instances.
   SetExpectedNofPropertiesFromEstimate(shared, lit->expected_property_count());
 
   // Check the function has compiled code.
   ASSERT(shared->is_compiled());
   return true;
 }
 
 
 } }  // namespace v8::internal