changeset 47:823b57d82686

meth, indy: update 292 API; support ldc of MH
author jrose
date Wed, 24 Mar 2010 18:36:29 -0700
parents 7cf9093b010b
children e255930cc27f
files compile-error-tweak.patch meth.patch series
diffstat 3 files changed, 26 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/compile-error-tweak.patch	Mon Mar 22 11:11:01 2010 +0100
+++ b/compile-error-tweak.patch	Wed Mar 24 18:36:29 2010 -0700
@@ -1,15 +1,21 @@
-diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
---- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-@@ -936,7 +936,7 @@
-             // create the desired method
-             m = new MethodSymbol(flags, name, mtype, c);
-             // make it throw all exceptions
--            Type exType = syms.exceptionType;
-+            Type exType = syms.throwableType;
-             m.type.setThrown(List.of(exType));
-             implicit.enter(m);
-         }
+There is a recurrent problem building javac in some environments.
+It is an import ambiguity, apparently due to small differences in compile-time classpath.
+Here is what the error looks like:
+|----------
+|.../langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java:896: reference to Version is ambiguous,
+|    both class com.sun.tools.javac.jvm.ClassFile.Version in com.sun.tools.javac.jvm.ClassFile
+|    and class com.sun.tools.javac.util.Version in com.sun.tools.javac.util match
+|        AttributeReader(Name name, Version version, Set<AttributeKind> kinds) {
+|                                   ^
+|.../langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java:909: reference to Version is ambiguous,
+|    both class com.sun.tools.javac.jvm.ClassFile.Version in com.sun.tools.javac.jvm.ClassFile
+|    and class com.sun.tools.javac.util.Version in com.sun.tools.javac.util match
+|        final Version version;
+|              ^
+|2 errors
+|----------
+This patch may be a useful workaround.
+
 diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/meth.patch	Mon Mar 22 11:11:01 2010 +0100
+++ b/meth.patch	Wed Mar 24 18:36:29 2010 -0700
@@ -1,64 +1,2 @@
-changes entrained after 6829189 appear in meth.patch proper
+Uncategorized changes for JSR 292, if any, go here.
 
-diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
---- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-@@ -936,6 +936,9 @@
-         if (m == null) {
-             // create the desired method
-             m = new MethodSymbol(flags, name, mtype, c);
-+            // make it throw all exceptions
-+            Type exType = syms.throwableType;
-+            m.type.setThrown(List.of(exType));
-             implicit.enter(m);
-         }
-         assert argumentsAcceptable(argtypes, types.memberType(site, m).getParameterTypes(),
-diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
---- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-@@ -55,6 +55,9 @@
- import static com.sun.tools.javac.jvm.ClassFile.*;
- import static com.sun.tools.javac.jvm.ClassFile.Version.*;
- 
-+// this Version is ambiguous with com.sun.tools.javac.util.Version
-+import com.sun.tools.javac.jvm.ClassFile.Version;
-+
- /** This class provides operations to read a classfile into an internal
-  *  representation. The internal representation is anchored in a
-  *  ClassSymbol which contains in its scope symbol representations
-diff --git a/test/tools/javac/meth/MakeNegTests.sh b/test/tools/javac/meth/MakeNegTests.sh
---- a/test/tools/javac/meth/MakeNegTests.sh
-+++ b/test/tools/javac/meth/MakeNegTests.sh
-@@ -23,10 +23,10 @@
- # have any questions.
- #
- 
--# @test
--# @bug 6754038
--# @summary Verify correct rejection of strongly typed return values
--# @run shell MakeNegTests.sh
-+# @#test
-+# @#bug 6754038
-+# @#summary Verify correct rejection of strongly typed return values
-+# @#run shell MakeNegTests.sh
- 
- default_template=InvokeMH.java
- javacflags='-source 7 -target 7'
-diff --git a/test/tools/javac/quid/MakeNegTests.sh b/test/tools/javac/quid/MakeNegTests.sh
---- a/test/tools/javac/quid/MakeNegTests.sh
-+++ b/test/tools/javac/quid/MakeNegTests.sh
-@@ -23,10 +23,10 @@
- # have any questions.
- #
- 
--# @test
--# @bug 6746458
--# @summary Verify correct rejection of illegal quoted identifiers.
--# @run shell MakeNegTests.sh
-+# @#test
-+# @#bug 6746458
-+# @#summary Verify correct rejection of illegal quoted identifiers.
-+# @#run shell MakeNegTests.sh
- 
- default_template=QuotedIdent.java
- # the rest of this file is a generic "//BAD"-line tester
--- a/series	Mon Mar 22 11:11:01 2010 +0100
+++ b/series	Wed Mar 24 18:36:29 2010 -0700
@@ -1,6 +1,13 @@
 # base = 455e979624a6 in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2010-03-20]
 
+compile-error-tweak.patch       #+compile-error-tweak
+netbeans-project.patch          #+netbeans-project
+dump-stack-on-error.patch       #+dump-stack-on-error
+
 meth.patch                      #-/meth #+455e979624a6
+meth-ing.patch                  #-/meth #+455e979624a6
+meth-ldc.patch                  #-/meth #+455e979624a6
+meth-anno.patch                 #-/meth #+455e979624a6 #-testable
 
 # Keep these separate, for debugging and review:
 dyncast.patch   #+dyncast       #-/dyncast