changeset 35:9197796589d5

series: Updated to be4c695c22cf. meth.patch: Likewise.
author twisti
date Mon, 05 Oct 2009 18:46:51 +0200
parents 4524a655b64e
children cd553e8abd82
files meth.patch series
diffstat 2 files changed, 3 insertions(+), 114 deletions(-) [+]
line wrap: on
line diff
--- a/meth.patch	Tue Sep 08 18:59:39 2009 +0200
+++ b/meth.patch	Mon Oct 05 18:46:51 2009 +0200
@@ -16,7 +16,7 @@
 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,9 @@
+@@ -55,6 +55,9 @@
  import static com.sun.tools.javac.jvm.ClassFile.*;
  import static com.sun.tools.javac.jvm.ClassFile.Version.*;
  
@@ -26,48 +26,6 @@
  /** 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/InvokeMH_BAD68.java b/test/tools/javac/meth/InvokeMH_BAD68.java
---- a/test/tools/javac/meth/InvokeMH_BAD68.java
-+++ b/test/tools/javac/meth/InvokeMH_BAD68.java
-@@ -22,12 +22,12 @@
-  */
- 
- /*
-- * ##test
-- * ##bug 6754038
-- * ##summary Generate call sites for method handle
-- * ##author jrose
-+ * @test
-+ * @bug 6754038
-+ * @summary Generate call sites for method handle
-+ * @author jrose
-  *
-- * ##compile/fail -source 7 -target 7 InvokeMH_BAD68.java
-+ * @compile/fail -source 7 -target 7 InvokeMH_BAD68.java
-  */
- 
- /*
-diff --git a/test/tools/javac/meth/InvokeMH_BAD72.java b/test/tools/javac/meth/InvokeMH_BAD72.java
---- a/test/tools/javac/meth/InvokeMH_BAD72.java
-+++ b/test/tools/javac/meth/InvokeMH_BAD72.java
-@@ -22,12 +22,12 @@
-  */
- 
- /*
-- * ##test
-- * ##bug 6754038
-- * ##summary Generate call sites for method handle
-- * ##author jrose
-+ * @test
-+ * @bug 6754038
-+ * @summary Generate call sites for method handle
-+ * @author jrose
-  *
-- * ##compile/fail -source 7 -target 7 InvokeMH_BAD72.java
-+ * @compile/fail -source 7 -target 7 InvokeMH_BAD72.java
-  */
- 
- /*
 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
@@ -104,72 +62,3 @@
  
  default_template=QuotedIdent.java
  # the rest of this file is a generic "//BAD"-line tester
-diff --git a/test/tools/javac/quid/QuotedIdent_BAD61.java b/test/tools/javac/quid/QuotedIdent_BAD61.java
---- a/test/tools/javac/quid/QuotedIdent_BAD61.java
-+++ b/test/tools/javac/quid/QuotedIdent_BAD61.java
-@@ -22,13 +22,13 @@
-  */
- 
- /*
-- * ##test
-- * ##bug 6746458
-- * ##summary Verify correct lexing of quoted identifiers.
-- * ##author jrose
-+ * @test
-+ * @bug 6746458
-+ * @summary Verify correct lexing of quoted identifiers.
-+ * @author jrose
-  *
-- * ##library ..
-- * ##run main quid.QuotedIdent_BAD61
-+ * @library ..
-+ * @run main quid.QuotedIdent_BAD61
-  */
- 
- /*
-diff --git a/test/tools/javac/quid/QuotedIdent_BAD62.java b/test/tools/javac/quid/QuotedIdent_BAD62.java
---- a/test/tools/javac/quid/QuotedIdent_BAD62.java
-+++ b/test/tools/javac/quid/QuotedIdent_BAD62.java
-@@ -22,13 +22,13 @@
-  */
- 
- /*
-- * ##test
-- * ##bug 6746458
-- * ##summary Verify correct lexing of quoted identifiers.
-- * ##author jrose
-+ * @test
-+ * @bug 6746458
-+ * @summary Verify correct lexing of quoted identifiers.
-+ * @author jrose
-  *
-- * ##library ..
-- * ##run main quid.QuotedIdent_BAD62
-+ * @library ..
-+ * @run main quid.QuotedIdent_BAD62
-  */
- 
- /*
-diff --git a/test/tools/javac/quid/QuotedIdent_BAD63.java b/test/tools/javac/quid/QuotedIdent_BAD63.java
---- a/test/tools/javac/quid/QuotedIdent_BAD63.java
-+++ b/test/tools/javac/quid/QuotedIdent_BAD63.java
-@@ -22,13 +22,13 @@
-  */
- 
- /*
-- * ##test
-- * ##bug 6746458
-- * ##summary Verify correct lexing of quoted identifiers.
-- * ##author jrose
-+ * @test
-+ * @bug 6746458
-+ * @summary Verify correct lexing of quoted identifiers.
-+ * @author jrose
-  *
-- * ##library ..
-- * ##run main quid.QuotedIdent_BAD63
-+ * @library ..
-+ * @run main quid.QuotedIdent_BAD63
-  */
- 
- /*
--- a/series	Tue Sep 08 18:59:39 2009 +0200
+++ b/series	Mon Oct 05 18:46:51 2009 +0200
@@ -1,5 +1,5 @@
-# base = 7780be72c042 in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2009-09-07]
-meth.patch                      #-/meth #+7780be72c042
+# base = be4c695c22cf in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2009-09-23]
+meth.patch                      #-/meth #+be4c695c22cf
 
 # Keep these separate, for debugging and review:
 dyncast.patch   #+dyncast       #-/dyncast