diff src/cpu/sparc/vm/debug_sparc.cpp @ 7066:7d815d842ee0

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 23 Nov 2012 11:50:27 +0100
parents da91efe96a93
children
line wrap: on
line diff
--- a/src/cpu/sparc/vm/debug_sparc.cpp	Fri Nov 23 11:40:17 2012 +0100
+++ b/src/cpu/sparc/vm/debug_sparc.cpp	Fri Nov 23 11:50:27 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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@
       CodeBlob *b = CodeCache::find_blob((address) pc);
       if (b != NULL) {
         if (b->is_nmethod()) {
-          methodOop m = ((nmethod*)b)->method();
+          Method* m = ((nmethod*)b)->method();
           int nlocals = m->max_locals();
           int nparams  = m->size_of_parameters();
           tty->print_cr("compiled java method (locals = %d, params = %d)", nlocals, nparams);