1.1 --- a/src/share/vm/compiler/methodLiveness.cpp Wed Jan 12 13:59:18 2011 -0800
1.2 +++ b/src/share/vm/compiler/methodLiveness.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 @@ -286,16 +286,15 @@
1.11 break;
1.12 case Bytecodes::_tableswitch:
1.13 {
1.14 - Bytecode_tableswitch *tableswitch =
1.15 - Bytecode_tableswitch_at(bytes.cur_bcp());
1.16 + Bytecode_tableswitch tableswitch(&bytes);
1.17
1.18 - int len = tableswitch->length();
1.19 + int len = tableswitch.length();
1.20
1.21 - dest = _block_map->at(bci + tableswitch->default_offset());
1.22 + dest = _block_map->at(bci + tableswitch.default_offset());
1.23 assert(dest != NULL, "branch desination must start a block.");
1.24 dest->add_normal_predecessor(current_block);
1.25 while (--len >= 0) {
1.26 - dest = _block_map->at(bci + tableswitch->dest_offset_at(len));
1.27 + dest = _block_map->at(bci + tableswitch.dest_offset_at(len));
1.28 assert(dest != NULL, "branch desination must start a block.");
1.29 dest->add_normal_predecessor(current_block);
1.30 }
1.31 @@ -304,17 +303,16 @@
1.32
1.33 case Bytecodes::_lookupswitch:
1.34 {
1.35 - Bytecode_lookupswitch *lookupswitch =
1.36 - Bytecode_lookupswitch_at(bytes.cur_bcp());
1.37 + Bytecode_lookupswitch lookupswitch(&bytes);
1.38
1.39 - int npairs = lookupswitch->number_of_pairs();
1.40 + int npairs = lookupswitch.number_of_pairs();
1.41
1.42 - dest = _block_map->at(bci + lookupswitch->default_offset());
1.43 + dest = _block_map->at(bci + lookupswitch.default_offset());
1.44 assert(dest != NULL, "branch desination must start a block.");
1.45 dest->add_normal_predecessor(current_block);
1.46 while(--npairs >= 0) {
1.47 - LookupswitchPair *pair = lookupswitch->pair_at(npairs);
1.48 - dest = _block_map->at( bci + pair->offset());
1.49 + LookupswitchPair pair = lookupswitch.pair_at(npairs);
1.50 + dest = _block_map->at( bci + pair.offset());
1.51 assert(dest != NULL, "branch desination must start a block.");
1.52 dest->add_normal_predecessor(current_block);
1.53 }
