1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java Tue Oct 23 13:58:56 2012 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java Thu Oct 25 11:09:36 2012 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, 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 @@ -27,6 +27,8 @@ 1.11 1.12 import com.sun.tools.javac.code.*; 1.13 1.14 +import static com.sun.tools.javac.code.TypeTag.UNINITIALIZED_OBJECT; 1.15 +import static com.sun.tools.javac.code.TypeTag.UNINITIALIZED_THIS; 1.16 1.17 /** These pseudo-types appear in the generated verifier tables to 1.18 * indicate objects that have been allocated but not yet constructed. 1.19 @@ -37,8 +39,6 @@ 1.20 * deletion without notice.</b> 1.21 */ 1.22 class UninitializedType extends Type.DelegatedType { 1.23 - public static final int UNINITIALIZED_THIS = TypeTags.TypeTagCount; 1.24 - public static final int UNINITIALIZED_OBJECT = UNINITIALIZED_THIS + 1; 1.25 1.26 public static UninitializedType uninitializedThis(Type qtype) { 1.27 return new UninitializedType(UNINITIALIZED_THIS, qtype, -1); 1.28 @@ -49,7 +49,7 @@ 1.29 } 1.30 1.31 public final int offset; // PC where allocation took place 1.32 - private UninitializedType(int tag, Type qtype, int offset) { 1.33 + private UninitializedType(TypeTag tag, Type qtype, int offset) { 1.34 super(tag, qtype); 1.35 this.offset = offset; 1.36 }