*** old/src/share/vm/classfile/classFileParser.cpp	Mon Mar 25 16:55:55 2013
--- new/src/share/vm/classfile/classFileParser.cpp	Mon Mar 25 16:55:55 2013

*** 1733,1745 ****
--- 1733,1750 ----
  ClassFileParser::AnnotationCollector::ID
  ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data,
                                                                  Symbol* name) {
    vmSymbols::SID sid = vmSymbols::find_sid(name);
    // Privileged code can use all annotations.  Other code silently drops some.
!   const bool privileged = loader_data->is_the_null_class_loader_data() ||
+                           loader_data->is_ext_class_loader_data() ||
                            loader_data->is_anonymous();
    switch (sid) {
+   case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_reflect_CallerSensitive_signature):
+     if (_location != _in_method)  break;  // only allow for methods
+     if (!privileged)              break;  // only allow in privileged code
+     return _method_CallerSensitive;
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
      if (_location != _in_method)  break;  // only allow for methods
      if (!privileged)              break;  // only allow in privileged code
      return _method_ForceInline;
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):

*** 1773,1782 ****
--- 1778,1789 ----
    MetadataFactory::free_array<u1>(_loader_data, _field_annotations);
    MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations);
  }
  
  void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
+   if (has_annotation(_method_CallerSensitive))
+     m->set_caller_sensitive(true);
    if (has_annotation(_method_ForceInline))
      m->set_force_inline(true);
    if (has_annotation(_method_DontInline))
      m->set_dont_inline(true);
    if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none)