makeSite_signature still has impl/java/dyn return type, hotspot indy.patch

[scheme.mlvm]

Hi!

I'm quite new to mlvm.
Tried to run InvokeDynamicDemo linked at 
http://blogs.sun.com/jrose/entry/simple_java_linkage_with_invokedynamic
Finally succeeded with compilation, but execution failed with:

Exception in thread "main" java.lang.NoSuchMethodError: 
sun.dyn.CallSiteImpl.makeSite(Ljava/lang/Class;Ljava/lang/String;Ljava/dyn/MethodType;II)Limpl/java/dyn/CallSiteImpl;
        at GetNameDemo.main(GetNameDemo.java:40)
        at Main.main(Main.java:34)

Traced it to patches/hotspot/indy.patch, where impl/java/dyn is still used 
instead of recently introduced sun.dyn:
+  template(makeSite_signature, 
"(Ljava/lang/Class;Ljava/lang/String;Ljava/dyn/MethodType;II)Limpl/java/dyn/CallSiteImpl;") 
\

Not sure about effects in patches/jdk/meth.patch:
+AUTO_FILES_JAVA_DIRS = java/dyn impl/java/dyn impl/java/dyn/util

Still a bit lost in mecurial forest, but I believe my repos to be 
up-to-date:
(cd patches/hotspot; hg pull; hg update; hg identify)
pulling from http://hg.openjdk.java.net/mlvm/mlvm/hotspot
searching for changes
no changes found
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
fafa7c078a66 tip

fyi, juergen