Remove unused code, improve speed of Parser::CurrentToken (improvement seen in measurements and pro…

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 222 matching lines @@
     Error& error = Error::Handle(isolate);
     error = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
     return error.raw();
   }
   UNREACHABLE();
   return Error::null();
 }
 
 
-static void InstallUnoptimizedCode(const Function& function) {
-  // Disable optimized code.
-  ASSERT(function.HasOptimizedCode());
-  if (FLAG_trace_compiler) {
-    OS::Print("--> patching entry %#" Px "\n",
-              Code::Handle(function.CurrentCode()).EntryPoint());
-  }
-  function.SwitchToUnoptimizedCode();
-  if (FLAG_trace_compiler) {
-    OS::Print("--> restoring entry at %#" Px "\n",
-              Code::Handle(function.unoptimized_code()).EntryPoint());
-  }
-}
-
-
 // Return false if bailed out.
 static bool CompileParsedFunctionHelper(ParsedFunction* parsed_function,
                                         bool optimized,
                                         intptr_t osr_id) {
   const Function& function = parsed_function->function();
   if (optimized && !function.IsOptimizable()) {
     return false;
   }
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
   bool is_compiled = false;
@@ skipping 497 matching lines @@
   }
 }
 
 
 static RawError* CompileFunctionHelper(const Function& function,
                                        bool optimized,
                                        intptr_t osr_id) {
   Isolate* isolate = Isolate::Current();
   StackZone zone(isolate);
   LongJumpScope jump;
-  // Make sure unoptimized code is not collected while we are compiling.
-  const Code& unoptimized_code = Code::ZoneHandle(function.unoptimized_code());
-  // Skips parsing if we need to only install unoptimized code.
-  if (!optimized && !unoptimized_code.IsNull()) {
-    InstallUnoptimizedCode(function);
-    return Error::null();
-  }
   if (setjmp(*jump.Set()) == 0) {
     TIMERSCOPE(isolate, time_compilation);
     Timer per_compile_timer(FLAG_trace_compiler, "Compilation time");
     per_compile_timer.Start();
     ParsedFunction* parsed_function =
         new ParsedFunction(Function::ZoneHandle(function.raw()));
     if (FLAG_trace_compiler) {
       OS::Print("Compiling %s%sfunction: '%s' @ token %" Pd ", size %" Pd "\n",
                 (osr_id == Isolate::kNoDeoptId ? "" : "osr "),
                 (optimized ? "optimized " : ""),
@@ skipping 201 matching lines @@
     const Object& result =
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart