1.1 --- a/src/share/vm/shark/sharkState.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/shark/sharkState.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * Copyright 2008, 2009 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 @@ -131,7 +131,7 @@
1.11 Value *this_method = this->method();
1.12 Value *other_method = other->method();
1.13 if (this_method != other_method) {
1.14 - PHINode *phi = builder()->CreatePHI(SharkType::methodOop_type(), "method");
1.15 + PHINode *phi = builder()->CreatePHI(SharkType::Method*_type(), "method");
1.16 phi->addIncoming(this_method, this_block);
1.17 phi->addIncoming(other_method, other_block);
1.18 set_method(phi);
1.19 @@ -287,7 +287,7 @@
1.20 char name[18];
1.21
1.22 // Method
1.23 - set_method(builder()->CreatePHI(SharkType::methodOop_type(), "method"));
1.24 + set_method(builder()->CreatePHI(SharkType::Method*_type(), "method"));
1.25
1.26 // Local variables
1.27 for (int i = 0; i < max_locals(); i++) {
