changeset 67:0e98cb257be0

indy-bsm: rebase
author jrose
date Thu, 12 Aug 2010 22:03:01 -0700
parents 921d71c53d7f
children 49cabfbbb3da
files indy-bsm-6964498.patch
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/indy-bsm-6964498.patch	Thu Aug 12 19:31:56 2010 -0700
+++ b/indy-bsm-6964498.patch	Thu Aug 12 22:03:01 2010 -0700
@@ -530,7 +530,7 @@
      public void visitNewClass(JCNewClass tree) {
          Type owntype = types.createErrorType(tree.type);
  
-@@ -1964,14 +2096,24 @@
+@@ -1975,14 +2107,24 @@
              if (meth.getTag() == JCTree.SELECT) {
                  JCFieldAccess methsel = (JCFieldAccess)meth;
                  if (rs.isPolymorphicSignatureInstance(methsel.sym)) {
@@ -554,9 +554,9 @@
 +                        methsel.sym = indysym.changeCallMethod((MethodSymbol) newSym);
 +                    else
 +                        methsel.sym = (MethodSymbol) newSym;
+                     expr.type = targetType;
+                     transformedExpr = expr;
                  }
-             }
-         }
 diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -992,9 +992,9 @@
 diff --git a/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties
 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
-@@ -127,6 +127,11 @@
- compiler.warn.wrong.target.for.polymorphic.signature=\
-     MethodHandle invocations work correctly only on -target 7 runtimes and better
+@@ -131,6 +131,11 @@
+ compiler.warn.wrong.target.for.polymorphic.signature.definition=\
+     MethodHandle API building requires -target 7 runtimes or better; current is -target {0}
  
 +compiler.err.invokedynamic.must.have.bootstrap.method=\
 +    InvokeDynamic calls must be in scope of a @BootstrapMethod annotation