1.1 --- a/src/share/vm/interpreter/rewriter.cpp Fri Feb 22 10:03:02 2013 +0100
1.2 +++ b/src/share/vm/interpreter/rewriter.cpp Fri Feb 22 08:36:42 2013 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 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 @@ -48,7 +48,6 @@
1.11 add_cp_cache_entry(i);
1.12 break;
1.13 case JVM_CONSTANT_String:
1.14 - case JVM_CONSTANT_Object:
1.15 case JVM_CONSTANT_MethodHandle : // fall through
1.16 case JVM_CONSTANT_MethodType : // fall through
1.17 add_resolved_references_entry(i);
1.18 @@ -238,7 +237,7 @@
1.19 address p = bcp + offset;
1.20 int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p);
1.21 constantTag tag = _pool->tag_at(cp_index).value();
1.22 - if (tag.is_method_handle() || tag.is_method_type() || tag.is_string() || tag.is_object()) {
1.23 + if (tag.is_method_handle() || tag.is_method_type() || tag.is_string()) {
1.24 int ref_index = cp_entry_to_resolved_references(cp_index);
1.25 if (is_wide) {
1.26 (*bcp) = Bytecodes::_fast_aldc_w;
