comparison anno-stable-8001107.patch @ 516:4cd7d914b0e3

rebase to current hsx/hotspot-comp
author jrose
date Sun, 06 Oct 2013 23:32:13 -0700
parents 37735140b62a
children
comparison
equal deleted inserted replaced
1:ddcc907aa466 2:8a7153acba11
349 + if (has_annotation(_field_Stable)) 349 + if (has_annotation(_field_Stable))
350 + f->set_stable(true); 350 + f->set_stable(true);
351 } 351 }
352 352
353 void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) { 353 void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
354 @@ -2125,7 +2143,7 @@ 354 @@ -2125,8 +2143,8 @@
355 runtime_visible_annotations_length = method_attribute_length; 355 runtime_visible_annotations_length = method_attribute_length;
356 runtime_visible_annotations = cfs->get_u1_buffer(); 356 runtime_visible_annotations = cfs->get_u1_buffer();
357 assert(runtime_visible_annotations != NULL, "null visible annotations"); 357 assert(runtime_visible_annotations != NULL, "null visible annotations");
358 - parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle)); 358 - parse_annotations(runtime_visible_annotations,
359 + parse_annotations(loader_data, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle)); 359 - runtime_visible_annotations_length, cp, &parsed_annotations,
360 + parse_annotations(loader_data,
361 + runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations,
362 CHECK_(nullHandle));
360 cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle)); 363 cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
361 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { 364 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
362 runtime_invisible_annotations_length = method_attribute_length;
363 @@ -2785,7 +2803,8 @@ 365 @@ -2785,7 +2803,8 @@
364 runtime_visible_annotations_length = attribute_length; 366 runtime_visible_annotations_length = attribute_length;
365 runtime_visible_annotations = cfs->get_u1_buffer(); 367 runtime_visible_annotations = cfs->get_u1_buffer();
366 assert(runtime_visible_annotations != NULL, "null visible annotations"); 368 assert(runtime_visible_annotations != NULL, "null visible annotations");
367 - parse_annotations(runtime_visible_annotations, 369 - parse_annotations(runtime_visible_annotations,
408 template(java_lang_invoke_ForceInline_signature, "Ljava/lang/invoke/ForceInline;") \ 410 template(java_lang_invoke_ForceInline_signature, "Ljava/lang/invoke/ForceInline;") \
409 template(java_lang_invoke_DontInline_signature, "Ljava/lang/invoke/DontInline;") \ 411 template(java_lang_invoke_DontInline_signature, "Ljava/lang/invoke/DontInline;") \
410 + template(sun_invoke_Stable_signature, "Lsun/invoke/Stable;") \ 412 + template(sun_invoke_Stable_signature, "Lsun/invoke/Stable;") \
411 template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \ 413 template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \
412 template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;") \ 414 template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;") \
413 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \ 415 template(java_lang_invoke_MagicLambdaImpl, "java/lang/invoke/MagicLambdaImpl") \
414 diff --git a/src/share/vm/oops/fieldInfo.hpp b/src/share/vm/oops/fieldInfo.hpp 416 diff --git a/src/share/vm/oops/fieldInfo.hpp b/src/share/vm/oops/fieldInfo.hpp
415 --- a/src/share/vm/oops/fieldInfo.hpp 417 --- a/src/share/vm/oops/fieldInfo.hpp
416 +++ b/src/share/vm/oops/fieldInfo.hpp 418 +++ b/src/share/vm/oops/fieldInfo.hpp
417 @@ -114,6 +114,14 @@ 419 @@ -114,6 +114,14 @@
418 return (access_flags() & JVM_ACC_FIELD_INTERNAL) != 0; 420 return (access_flags() & JVM_ACC_FIELD_INTERNAL) != 0;