Reset trunk to 3.24.35.4

src/compiler.h

 // Copyright 2012 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 157 matching lines @@
   }
 
   ParseRestriction parse_restriction() const {
     return ParseRestricitonField::decode(flags_);
   }
 
   void SetFunction(FunctionLiteral* literal) {
     ASSERT(function_ == NULL);
     function_ = literal;
   }
-  // When the scope is applied, we may have deferred work to do on the function.
-  void PrepareForCompilation(Scope* scope);
+  void SetScope(Scope* scope) {
+    ASSERT(scope_ == NULL);
+    scope_ = scope;
+  }
   void SetGlobalScope(Scope* global_scope) {
     ASSERT(global_scope_ == NULL);
     global_scope_ = global_scope;
   }
   void SetCode(Handle<Code> code) { code_ = code; }
   void SetExtension(v8::Extension* extension) {
     ASSERT(!is_lazy());
     extension_ = extension;
   }
   void SetPreParseData(ScriptDataImpl* pre_parse_data) {
@@ skipping 30 matching lines @@
 
   // Accessors for the different compilation modes.
   bool IsOptimizing() const { return mode_ == OPTIMIZE; }
   bool IsOptimizable() const { return mode_ == BASE; }
   bool IsStub() const { return mode_ == STUB; }
   void SetOptimizing(BailoutId osr_ast_id, Handle<Code> unoptimized) {
     ASSERT(!shared_info_.is_null());
     SetMode(OPTIMIZE);
     osr_ast_id_ = osr_ast_id;
     unoptimized_code_ = unoptimized;
-    optimization_id_ = isolate()->NextOptimizationId();
   }
   void DisableOptimization();
 
   // Deoptimization support.
   bool HasDeoptimizationSupport() const {
     return SupportsDeoptimization::decode(flags_);
   }
   void EnableDeoptimizationSupport() {
     ASSERT(IsOptimizable());
     flags_ |= SupportsDeoptimization::encode(true);
@@ skipping 68 matching lines @@
 
   bool HasAbortedDueToDependencyChange() {
     ASSERT(!OptimizingCompilerThread::IsOptimizerThread(isolate()));
     return abort_due_to_dependency_;
   }
 
   bool HasSameOsrEntry(Handle<JSFunction> function, BailoutId osr_ast_id) {
     return osr_ast_id_ == osr_ast_id && function.is_identical_to(closure_);
   }
 
-  int optimization_id() const { return optimization_id_; }
-
  protected:
   CompilationInfo(Handle<Script> script,
                   Zone* zone);
   CompilationInfo(Handle<SharedFunctionInfo> shared_info,
                   Zone* zone);
   CompilationInfo(HydrogenCodeStub* stub,
                   Isolate* isolate,
                   Zone* zone);
 
  private:
@@ skipping 115 matching lines @@
   // during graph optimization.
   int opt_count_;
 
   // Number of parameters used for compilation of stubs that require arguments.
   int parameter_count_;
 
   bool this_has_uses_;
 
   Handle<Foreign> object_wrapper_;
 
-  int optimization_id_;
-
   DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
 };
 
 
 // Exactly like a CompilationInfo, except also creates and enters a
 // Zone on construction and deallocates it on exit.
 class CompilationInfoWithZone: public CompilationInfo {
  public:
   explicit CompilationInfoWithZone(Handle<Script> script)
       : CompilationInfo(script, &zone_),
@@ skipping 211 matching lines @@
   unsigned info_zone_start_allocation_size_;
   ElapsedTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationPhase);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILER_H_