1.1 --- a/src/share/vm/oops/method.cpp Tue Jan 22 11:54:16 2013 -0800 1.2 +++ b/src/share/vm/oops/method.cpp Wed Jan 23 10:34:29 2013 -0500 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -23,6 +23,7 @@ 1.11 */ 1.12 1.13 #include "precompiled.hpp" 1.14 +#include "classfile/metadataOnStackMark.hpp" 1.15 #include "classfile/systemDictionary.hpp" 1.16 #include "code/debugInfoRec.hpp" 1.17 #include "gc_interface/collectedHeap.inline.hpp" 1.18 @@ -41,7 +42,6 @@ 1.19 #include "oops/oop.inline.hpp" 1.20 #include "oops/symbol.hpp" 1.21 #include "prims/jvmtiExport.hpp" 1.22 -#include "prims/jvmtiRedefineClasses.hpp" 1.23 #include "prims/methodHandles.hpp" 1.24 #include "prims/nativeLookup.hpp" 1.25 #include "runtime/arguments.hpp" 1.26 @@ -1027,7 +1027,7 @@ 1.27 cp->set_pool_holder(InstanceKlass::cast(holder())); 1.28 cp->symbol_at_put(_imcp_invoke_name, name); 1.29 cp->symbol_at_put(_imcp_invoke_signature, signature); 1.30 - cp->set_preresolution(); 1.31 + cp->set_has_preresolution(); 1.32 1.33 // decide on access bits: public or not? 1.34 int flags_bits = (JVM_ACC_NATIVE | JVM_ACC_SYNTHETIC | JVM_ACC_FINAL);