*** old/src/share/vm/ci/ciClassList.hpp	Wed Oct 28 20:02:14 2009
--- new/src/share/vm/ci/ciClassList.hpp	Wed Oct 28 20:02:14 2009

*** 41,50 ****
--- 41,52 ----
  class ciTypeFlow;
  
  class ciObject;
  class   ciNullObject;
  class   ciInstance;
+ class     ciCallSite;
+ class     ciMethodHandle;
  class   ciMethod;
  class   ciMethodData;
  class     ciReceiverTypeData;  // part of ciMethodData
  class   ciSymbol;
  class   ciArray;

*** 77,86 ****
--- 79,89 ----
  
  // These are the packages that have access to ciEnv
  // Any more access must be given explicitly.
  #define CI_PACKAGE_ACCESS_TO           \
  friend class ciObjectFactory;          \
+ friend class ciCallSite;               \
  friend class ciConstantPoolCache;      \
  friend class ciField;                  \
  friend class ciConstant;               \
  friend class ciFlags;                  \
  friend class ciExceptionHandler;       \

*** 92,101 ****
--- 95,105 ----
  friend class ciObject;                 \
  friend class ciNullObject;             \
  friend class ciInstance;               \
  friend class ciMethod;                 \
  friend class ciMethodData;             \
+ friend class ciMethodHandle;           \
  friend class ciReceiverTypeData;       \
  friend class ciSymbol;                 \
  friend class ciArray;                  \
  friend class ciObjArray;               \
  friend class ciTypeArray;              \