Mercurial > hg > truffle
diff src/share/vm/shark/sharkCompiler.cpp @ 2447:e863062e521d
7032458: Zero and Shark fixes
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
author | twisti |
---|---|
date | Mon, 04 Apr 2011 03:02:00 -0700 |
parents | f95d63e2154a |
children | 5d0bb7d52783 2cd5e15048e6 |
line wrap: on
line diff
--- a/src/share/vm/shark/sharkCompiler.cpp Sun Apr 03 12:00:54 2011 +0200 +++ b/src/share/vm/shark/sharkCompiler.cpp Mon Apr 04 03:02:00 2011 -0700 @@ -1,6 +1,6 @@ /* * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2008, 2009, 2010, 2011 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -218,6 +218,7 @@ nmethod* SharkCompiler::generate_native_wrapper(MacroAssembler* masm, methodHandle target, + int compile_id, BasicType* arg_types, BasicType return_type) { assert(is_initialized(), "should be"); @@ -241,6 +242,7 @@ // Return the nmethod for installation in the VM return nmethod::new_native_nmethod(target, + compile_id, masm->code(), 0, 0,