Mercurial > hg > graal-compiler
diff src/share/vm/shark/sharkCacheDecache.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | e1a03c81cef0 da91efe96a93 |
| children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/share/vm/shark/sharkCacheDecache.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/shark/sharkCacheDecache.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -107,7 +107,7 @@ void SharkDecacher::process_method_slot(Value** value, int offset) { // Decache the method pointer write_value_to_frame( - SharkType::methodOop_type(), + SharkType::Method*_type(), *value, offset); @@ -207,7 +207,7 @@ void SharkCacher::process_method_slot(Value** value, int offset) { // Cache the method pointer - *value = read_value_from_frame(SharkType::methodOop_type(), offset); + *value = read_value_from_frame(SharkType::Method*_type(), offset); } void SharkFunctionEntryCacher::process_method_slot(Value** value, int offset) {