Revert change 6302 until the compiler warning is addressed.

vm/code_index_table_test.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 "platform/assert.h"
 #include "vm/class_finalizer.h"
+#include "vm/code_index_table.h"
 #include "vm/compiler.h"
 #include "vm/object.h"
 #include "vm/pages.h"
-#include "vm/stack_frame.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 // Compiler only implemented on IA32 and x64 now.
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(CodeIndexTable) {
 #if defined(TARGET_ARCH_IA32)
   const int kLoopCount = 50000;
 #else
   const int kLoopCount = 25000;
 #endif
   const int kScriptSize = 512 * KB;
   const int kNumFunctions = 1024;
   char scriptChars[kScriptSize];
   String& url = String::Handle(String::New("dart-test:CodeIndexTable"));
   String& source = String::Handle();
   Script& script = Script::Handle();
   Library& lib = Library::Handle();
   Class& clsA = Class::Handle();
   Class& clsB = Class::Handle();
   String& function_name = String::Handle();
   Function& function = Function::Handle();
   char buffer[256];
 
   // Get access to the code index table.
-  Isolate* isolate = Isolate::Current();
-  ASSERT(isolate != NULL);
+  ASSERT(Isolate::Current() != NULL);
+  CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
+  ASSERT(code_index_table != NULL);
 
   lib = Library::CoreLibrary();
 
   // Load up class A with 1024 functions.
   int written = OS::SNPrint(scriptChars, kScriptSize, "class A {");
   for (int i = 0; i < kNumFunctions; i++) {
     OS::SNPrint(buffer,
                 256,
                 "static foo%d([int i=1,int j=2,int k=3]){return i+j+k;}", i);
     written += OS::SNPrint((scriptChars + written),
@@ skipping 68 matching lines @@
   // Now try and access these functions using the code index table.
   Code& code = Code::Handle();
   uword pc;
   OS::SNPrint(buffer, 256, "foo%d", 123);
   function_name = String::New(buffer);
   function = clsA.LookupStaticFunction(function_name);
   EXPECT(!function.IsNull());
   code = function.CurrentCode();
   EXPECT(code.Size() > 16);
   pc = code.EntryPoint() + 16;
-  EXPECT(StackFrame::LookupCode(isolate, pc) == code.raw());
+  EXPECT(code_index_table->LookupCode(pc) == code.raw());
 
   OS::SNPrint(buffer, 256, "moo%d", 54);
   function_name = String::New(buffer);
   function = clsB.LookupStaticFunction(function_name);
   EXPECT(!function.IsNull());
   code = function.CurrentCode();
   EXPECT(code.Size() > 16);
   pc = code.EntryPoint() + 16;
-  EXPECT(StackFrame::LookupCode(isolate, pc) == code.raw());
+  EXPECT(code_index_table->LookupCode(pc) == code.raw());
 
   // Lookup the large function
   OS::SNPrint(buffer, 256, "moo%d", 0);
   function_name = String::New(buffer);
   function = clsB.LookupStaticFunction(function_name);
   EXPECT(!function.IsNull());
   code = function.CurrentCode();
   EXPECT(code.Size() > 16);
   pc = code.EntryPoint() + 16;
   EXPECT(code.Size() > PageSpace::kPageSize);
-  EXPECT(StackFrame::LookupCode(isolate, pc) == code.raw());
+  EXPECT(code_index_table->LookupCode(pc) == code.raw());
   EXPECT(code.Size() > (1 * MB));
   pc = code.EntryPoint() + (1 * MB);
-  EXPECT(StackFrame::LookupCode(isolate, pc) == code.raw());
+  EXPECT(code_index_table->LookupCode(pc) == code.raw());
 }
 
 #endif  // TARGET_ARCH_IA32 || TARGET_ARCH_X64
 
 }  // namespace dart