Revert change 6302 until the compiler warning is addressed.

vm/code_generator.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/code_generator.h"
 
+#include "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
 #include "vm/message.h"
 #include "vm/resolver.h"
 #include "vm/runtime_entry.h"
@@ skipping 1262 matching lines @@
 // Find the node id of the deoptimization point and find the continuation
 // pc in the unoptimized code.
 // Since both unoptimized and optimized code have the same layout, we need only
 // to patch the pc of the Dart frame and to disable/enable appropriate code.
 DEFINE_RUNTIME_ENTRY(Deoptimize, 1) {
   ASSERT(arguments.Count() == kDeoptimizeRuntimeEntry.argument_count());
   const Smi& deoptimization_reason_id = Smi::CheckedHandle(arguments.At(0));
   DartFrameIterator iterator;
   DartFrame* caller_frame = iterator.NextFrame();
   ASSERT(caller_frame != NULL);
-  const Code& optimized_code = Code::Handle(caller_frame->LookupDartCode());
+  CodeIndexTable* ci_table = isolate->code_index_table();
+  const Code& optimized_code =
+      Code::Handle(ci_table->LookupCode(caller_frame->pc()));
   const Function& function = Function::Handle(optimized_code.function());
   ASSERT(!function.IsNull());
   const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
   ASSERT(!optimized_code.IsNull() && optimized_code.is_optimized());
   ASSERT(!unoptimized_code.IsNull() && !unoptimized_code.is_optimized());
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(optimized_code.pc_descriptors());
   ASSERT(!descriptors.IsNull());
   // Locate node id at deoptimization point inside optimized code.
   intptr_t deopt_node_id = AstNode::kNoId;
@@ skipping 129 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart