First part of static call cleanup: store static call targets into code object, referenced by code-o…

runtime/vm/native_entry_test.cc

 // Copyright (c) 2011, 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/native_entry_test.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
@@ skipping 40 matching lines @@
     result += arg_value;
   }
   Dart_SetReturnValue(args, Dart_NewInteger(result));
   Dart_ExitScope();
 }
 
 
 // Test code patching.
 void TestStaticCallPatching(Dart_NativeArguments args) {
   Dart_EnterScope();
-  uword target_address = 0;
   Function& target_function = Function::Handle();
   DartFrameIterator iterator;
   iterator.NextFrame();  // Skip native call.
   StackFrame* static_caller_frame = iterator.NextFrame();
+  uword target_address = 0;

[siva, 2012/11/16 23:15:23]

TODO that you will replace GetStaticCallAt with
Code::GetStaticCallTaregtAtOffset(...)

One performance point here, it would be more optimal to
get the code object from the stack frame than by using
Code::LookupCode(pc) inside Code::GetStaticCallTargetAt(..).

You could write this code as:
const Code& code = Code::Handle(static_call_frame->LookupDartCode());
uword offset = (static_caller_frame->pc() - code.EntryPoint());
const Function& target_function_2 =
Function::Handle(code.GetStaticCallTargetAtOffset(offset));

[srdjan, 2012/11/17 00:47:24]

Addressed as discussed

   CodePatcher::GetStaticCallAt(static_caller_frame->pc(),
                                &target_function,
                                &target_address);
+  const Function& target_function_2 =
+      Function::Handle(Code::GetStaticCallTargetAt(static_caller_frame->pc()));
+  EXPECT(!target_function_2.IsNull());
+  EXPECT_EQ(target_function_2.raw(), target_function.raw());
   EXPECT(String::Handle(target_function.name()).
       Equals(String::Handle(String::New("NativePatchStaticCall"))));
   const uword function_entry_address =
       Code::Handle(target_function.CurrentCode()).EntryPoint();
   EXPECT_EQ(function_entry_address, target_address);
   Dart_ExitScope();
 }
 
 }  // namespace dart