--- a/hotspot/src/share/vm/shark/sharkContext.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/shark/sharkContext.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -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 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -61,8 +61,8 @@
   _jniHandleBlock_type = PointerType::getUnqual(
     ArrayType::get(jbyte_type(), sizeof(JNIHandleBlock)));
 
-  _methodOop_type = PointerType::getUnqual(
-    ArrayType::get(jbyte_type(), sizeof(methodOopDesc)));
+  _Method*_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(Method)));
 
   _monitor_type = ArrayType::get(
     jbyte_type(), frame::interpreter_frame_monitor_size() * wordSize);
@@ -77,13 +77,13 @@
     ArrayType::get(jbyte_type(), sizeof(ZeroStack)));
 
   std::vector<const Type*> params;
-  params.push_back(methodOop_type());
+  params.push_back(Method*_type());
   params.push_back(intptr_type());
   params.push_back(thread_type());
   _entry_point_type = FunctionType::get(jint_type(), params, false);
 
   params.clear();
-  params.push_back(methodOop_type());
+  params.push_back(Method*_type());
   params.push_back(PointerType::getUnqual(jbyte_type()));
   params.push_back(intptr_type());
   params.push_back(thread_type());