--- a/meth.patch Fri Jun 12 15:05:04 2009 -0700
+++ b/meth.patch Fri Jun 12 23:49:36 2009 -0700
@@ -1,5 +1,18 @@ changes entrained after 6829189 appear i
changes entrained after 6829189 appear in meth.patch proper
+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
+@@ -935,6 +935,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/test/tools/javac/meth/InvokeMH_BAD68.java b/test/tools/javac/meth/InvokeMH_BAD68.java
new file mode 100644
--- /dev/null
--- a/nb-javac/meth.patch Fri Jun 12 15:05:04 2009 -0700
+++ b/nb-javac/meth.patch Fri Jun 12 23:49:36 2009 -0700
@@ -164,7 +164,7 @@ diff --git a/src/share/classes/com/sun/t
}
/** error symbols, which are returned when resolution fails
-@@ -848,6 +850,77 @@
+@@ -848,6 +850,80 @@
return bestSoFar;
}
@@ -220,6 +220,9 @@ diff --git a/src/share/classes/com/sun/t
+ 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(),
@@ -242,7 +245,7 @@ diff --git a/src/share/classes/com/sun/t
/** Load toplevel or member class with given fully qualified name and
* verify that it is accessible.
* @param env The current environment.
-@@ -1244,6 +1316,14 @@
+@@ -1244,6 +1320,14 @@
sym = findMethod(env, site, name, argtypes, typeargtypes, true,
env.info.varArgs=true, false);
}
--- a/nb-javac/netbeans.txt Fri Jun 12 15:05:04 2009 -0700
+++ b/nb-javac/netbeans.txt Fri Jun 12 23:49:36 2009 -0700
@@ -24,9 +24,11 @@ Deploy the updated javac into a scratch
$ nborig="/Applications/NetBeans/NetBeans 6.5.app"
$ nbcopy="/Applications/NetBeans/NetBeans 6.5 Experimental.app"
-$ nbres="Contents/Resources/NetBeans/java2/modules/ext/javac-api-nb-7.0-b07.jar"
$ cp -pr "$nborig" "$nbcopy"
-$ cp make/netbeans/nb-javac/dist/javac-impl.jar "$nbcopy/$nbres"
+
+$ nbdist="$nbcopy/Contents/Resources/NetBeans/java2/modules/ext"
+$ cp make/netbeans/nb-javac/dist/javac-impl.jar "$nbdist"/javac-impl-nb-7.0-b07.jar
+$ cp make/netbeans/nb-javac/dist/javac-api.jar "$nbdist"/javac-api-nb-7.0-b07.jar
(There is probably a better way to plug this in; ask any NetBeans expert and let me know.)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compile-error-tweak.patch Fri Jun 12 23:49:36 2009 -0700
@@ -0,0 +1,23 @@
+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);
+ }
+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
+@@ -54,6 +54,7 @@
+ import static com.sun.tools.javac.code.TypeTags.*;
+ import static com.sun.tools.javac.jvm.ClassFile.*;
+ import static com.sun.tools.javac.jvm.ClassFile.Version.*;
++import static com.sun.tools.javac.jvm.ClassFile.Version; // TEMPORARY
+
+ /** This class provides operations to read a classfile into an internal
+ * representation. The internal representation is anchored in a