changeset 477:71016edd5799

annot, meth: update
author jrose
date Thu, 12 Jul 2012 00:50:46 -0700
parents 0ffb542eb0de
children f55844a06cc2
files annot-6711908.patch meth-lazy-7023639.patch
diffstat 2 files changed, 6 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/annot-6711908.patch	Thu Jul 12 00:37:44 2012 -0700
+++ b/annot-6711908.patch	Thu Jul 12 00:50:46 2012 -0700
@@ -1,7 +1,7 @@
 6711908: JVM needs direct access to some annotations
 Summary: Add annotation extraction code to class file parser.
+Reviewed-by: twisti, jrose, kvn
 Contributed-by: michael.haupt@oracle.com
-Reviewed-by: twisti, jrose, kvn
 
 diff --git a/src/share/vm/c1/c1_GraphBuilder.cpp b/src/share/vm/c1/c1_GraphBuilder.cpp
 --- a/src/share/vm/c1/c1_GraphBuilder.cpp
--- a/meth-lazy-7023639.patch	Thu Jul 12 00:37:44 2012 -0700
+++ b/meth-lazy-7023639.patch	Thu Jul 12 00:50:46 2012 -0700
@@ -1,8 +1,8 @@
 7023639: JSR 292 method handle invocation needs a fast path for compiled code
 6984705: JSR 292 method handle creation should not go through JNI
-remove assembly code for JDK 7 chained method handles
+Summary: remove assembly code for JDK 7 chained method handles
+Reviewed-by: jrose, twisti, mhaupt
 Contributed-by: jrose, twisti, mhaupt
-Reviewed-by: jrose, twisti, mhaupt
 
 diff --git a/src/cpu/sparc/vm/assembler_sparc.cpp b/src/cpu/sparc/vm/assembler_sparc.cpp
 --- a/src/cpu/sparc/vm/assembler_sparc.cpp
@@ -10315,11 +10315,9 @@
    assert(!callee->is_native(), "callee must not be native");
    if (CompilationPolicy::policy()->should_not_inline(compilation()->env(), callee)) {
      INLINE_BAILOUT("inlining prohibited by policy");
-@@ -3507,9 +3599,10 @@
-   // now perform tests that are based on flag settings
-   if (callee->force_inline() || callee->should_inline()) {
-     // ignore heuristic controls on inlining
-+    print_inlining(callee, "force inline by annotation");
+@@ -3508,8 +3600,8 @@
+     if (callee->force_inline())
+       CompileTask::print_inlining(callee, scope()->level(), bci(), "force inline by annotation");
    } else {
 -    if (inline_level() > MaxInlineLevel                         ) INLINE_BAILOUT("too-deep inlining");
 -    if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("too-deep recursive inlining");
@@ -12011,15 +12009,6 @@
 diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp
 --- a/src/share/vm/classfile/classFileParser.cpp
 +++ b/src/share/vm/classfile/classFileParser.cpp
-@@ -1653,7 +1653,7 @@
- // Skip an annotation.  Return >=limit if there is any problem.
- int ClassFileParser::skip_annotation(u1* buffer, int limit, int index) {
-   // annotation := atype:u2 do(nmem:u2) {member:u2 value}
--  // value := switch (tag:u1) { ... } 
-+  // value := switch (tag:u1) { ... }
-   index += 2;  // skip atype
-   if ((index += 2) >= limit)  return limit;  // read nmem
-   int nmem = Bytes::get_Java_u2(buffer+index-2);
 @@ -1777,6 +1777,15 @@
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
      if (_location != _in_method)  break;  // only allow for methods