1.1 --- a/src/share/vm/ci/ciClassList.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/ci/ciClassList.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 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 @@ -28,7 +28,6 @@
1.11 class ciEnv;
1.12 class ciObjectFactory;
1.13 class ciConstantPoolCache;
1.14 -class ciCPCache;
1.15
1.16 class ciField;
1.17 class ciConstant;
1.18 @@ -43,32 +42,28 @@
1.19
1.20 class ciTypeFlow;
1.21
1.22 +class ciBaseObject;
1.23 class ciObject;
1.24 class ciNullObject;
1.25 class ciInstance;
1.26 class ciCallSite;
1.27 class ciMemberName;
1.28 class ciMethodHandle;
1.29 +class ciArray;
1.30 +class ciObjArray;
1.31 +class ciTypeArray;
1.32 +class ciSymbol;
1.33 +class ciMetadata;
1.34 class ciMethod;
1.35 class ciMethodData;
1.36 class ciReceiverTypeData; // part of ciMethodData
1.37 -class ciSymbol;
1.38 -class ciArray;
1.39 -class ciObjArray;
1.40 -class ciTypeArray;
1.41 class ciType;
1.42 class ciReturnAddress;
1.43 class ciKlass;
1.44 class ciInstanceKlass;
1.45 -class ciMethodKlass;
1.46 class ciArrayKlass;
1.47 class ciObjArrayKlass;
1.48 class ciTypeArrayKlass;
1.49 -class ciKlassKlass;
1.50 -class ciInstanceKlassKlass;
1.51 -class ciArrayKlassKlass;
1.52 -class ciObjArrayKlassKlass;
1.53 -class ciTypeArrayKlassKlass;
1.54
1.55 // Simulate Java Language style package-private access with
1.56 // friend declarations.
1.57 @@ -90,7 +85,6 @@
1.58 friend class ciConstantPoolCache; \
1.59 friend class ciField; \
1.60 friend class ciConstant; \
1.61 -friend class ciCPCache; \
1.62 friend class ciFlags; \
1.63 friend class ciExceptionHandler; \
1.64 friend class ciCallProfile; \
1.65 @@ -109,19 +103,14 @@
1.66 friend class ciSymbol; \
1.67 friend class ciArray; \
1.68 friend class ciObjArray; \
1.69 +friend class ciMetadata; \
1.70 friend class ciTypeArray; \
1.71 friend class ciType; \
1.72 friend class ciReturnAddress; \
1.73 friend class ciKlass; \
1.74 friend class ciInstanceKlass; \
1.75 -friend class ciMethodKlass; \
1.76 friend class ciArrayKlass; \
1.77 friend class ciObjArrayKlass; \
1.78 friend class ciTypeArrayKlass; \
1.79 -friend class ciKlassKlass; \
1.80 -friend class ciInstanceKlassKlass; \
1.81 -friend class ciArrayKlassKlass; \
1.82 -friend class ciObjArrayKlassKlass; \
1.83 -friend class ciTypeArrayKlassKlass;
1.84
1.85 #endif // SHARE_VM_CI_CICLASSLIST_HPP
