hg: mlvm/mlvm/hotspot: meth: rebase to b42; improve implementation

[Ben Evans]

Merry Christmas John (and everyone),

I'm starting to look at the delta between the current bsd-port and b42, to
see what needs doing to get this building on Mac and I've noticed something
which seems a bit odd about meth.patch

It contains this hunk:

diff --git a/src/share/classes/com/sun/tools/javac/util/Name.java
b/src/share/classes/com/sun/tools/javac/util/Name.java
--- a/src/share/classes/com/sun/tools/javac/util/Name.java
+++ b/src/share/classes/com/sun/tools/javac/util/Name.java
@@ -437,6 +437,8 @@
             java_lang_Cloneable = fromString("java.lang.Cloneable");
             java_io_Serializable = fromString("java.io.Serializable");
             java_lang_Enum = fromString("java.lang.Enum");
+            java_dyn_MethodHandle = fromString("java.dyn.MethodHandle");
+            java_dyn_Dynamic = fromString("java.dyn.Dynamic");
             package_info = fromString("package-info");
             serialVersionUID = fromString("serialVersionUID");
             ConstantValue = fromString("ConstantValue");
@@ -478,6 +480,7 @@
             value = fromString("value");
             getMessage = fromString("getMessage");
             getClass = fromString("getClass");
+            invoke = fromString("invoke");

             TYPE = fromString("TYPE");
             FIELD = fromString("FIELD");
@@ -571,6 +574,8 @@
         public final Name java_io_Serializable;
         public final Name serialVersionUID;
         public final Name java_lang_Enum;
+        public final Name java_dyn_MethodHandle;
+        public final Name java_dyn_Dynamic;
         public final Name package_info;
         public final Name ConstantValue;
         public final Name LineNumberTable;
@@ -612,6 +617,7 @@
         public final Name value;
         public final Name getMessage;
         public final Name getClass;
+        public final Name invoke;

         public final Name TYPE;
         public final Name FIELD;

but in the code which I fclone'd today, those additions look like they
should be applied to Names.java rather than Name.java as the diff line would
suggest.

Am I making some schoolboy error which currently eludes me?

Thanks,

Ben

On Fri, Dec 26, 2008 at 9:03 AM, John Rose <John.Rose at sun.com> wrote:

> I've spent the last 24+ hours enjoying more traditional forms of
> merrymaking.  (Though I was indeed having a wild ride with that meth.patch
> stuff.)
> Merry Christmas (x 12 days of); enjoy all the good things the holidays
> bring!
>
> Warm best wishes,
> -- John
> On Dec 25, 2008, at 6:36 AM, David Pollak wrote:
>
> (F)rebasing meth... a new kind of Christmas cheer.  :-)
>
> Sorry... it's t-minus 30 minutes to kids waking up and I spent many hours
> last night doing "some assembly required"
>
>
> On Dec 24, 2008 8:22 PM, <john.rose at sun.com> wrote:
>
> Changeset: 1d42dc25d9e3
> Author:    jrose
> Date:      2008-12-24 19:53 -0800
> URL:       http://hg.openjdk.java.net/mlvm/mlvm/hotspot/rev/1d42dc25d9e3
>
> meth: rebase to b42; improve implementation
>
> ! meth.patch
> ! meth.txt
> ! series
>
> _____________
>
>
> _______________________________________________
> mlvm-dev mailing list
> mlvm-dev at openjdk.java.net
> http://mail.openjdk.java.net/mailman/listinfo/mlvm-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/mlvm-dev/attachments/20081226/cab62f3f/attachment.html