1.1 --- a/src/share/vm/interpreter/rewriter.cpp Wed Jan 12 13:59:18 2011 -0800
1.2 +++ b/src/share/vm/interpreter/rewriter.cpp Thu Jan 13 22:15:41 2011 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2011, 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 @@ -221,7 +221,7 @@
1.11 // call to calculate the length.
1.12 bc_length = Bytecodes::length_for(c);
1.13 if (bc_length == 0) {
1.14 - bc_length = Bytecodes::length_at(bcp);
1.15 + bc_length = Bytecodes::length_at(method, bcp);
1.16
1.17 // length_at will put us at the bytecode after the one modified
1.18 // by 'wide'. We don't currently examine any of the bytecodes
1.19 @@ -237,9 +237,9 @@
1.20 switch (c) {
1.21 case Bytecodes::_lookupswitch : {
1.22 #ifndef CC_INTERP
1.23 - Bytecode_lookupswitch* bc = Bytecode_lookupswitch_at(bcp);
1.24 + Bytecode_lookupswitch bc(method, bcp);
1.25 (*bcp) = (
1.26 - bc->number_of_pairs() < BinarySwitchThreshold
1.27 + bc.number_of_pairs() < BinarySwitchThreshold
1.28 ? Bytecodes::_fast_linearswitch
1.29 : Bytecodes::_fast_binaryswitch
1.30 );
