Mercurial > hg > truffle

diff src/share/vm/runtime/sharedRuntime.hpp @ 3243:208b6c560ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author vladidan
date Thu, 14 Apr 2011 11:02:05 -0400
parents 3d58a4983660
children 008adfd6d850 167b70ff3abc
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.hpp	Tue Apr 12 10:32:42 2011 -0400
+++ b/src/share/vm/runtime/sharedRuntime.hpp	Thu Apr 14 11:02:05 2011 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -438,6 +438,7 @@
   // returns.
   static nmethod *generate_native_wrapper(MacroAssembler* masm,
                                           methodHandle method,
+                                          int compile_id,
                                           int total_args_passed,
                                           int max_arg,
                                           BasicType *sig_bt,
@@ -659,7 +660,7 @@
 
   static AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint,
                                         address i2c_entry, address c2i_entry, address c2i_unverified_entry);
-  static nmethod* create_native_wrapper(methodHandle method);
+  static nmethod* create_native_wrapper(methodHandle method, int compile_id);
   static AdapterHandlerEntry* get_adapter(methodHandle method);
 
 #ifdef HAVE_DTRACE_H