--- a/dyncast.patch	Thu Mar 26 19:55:19 2009 -0500
+++ b/dyncast.patch	Fri Mar 27 01:39:54 2009 -0500
@@ -27,15 +27,16 @@ diff --git a/src/share/classes/com/sun/t
 diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
 --- a/src/share/classes/com/sun/tools/javac/code/Types.java
 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java
-@@ -266,6 +266,7 @@
+@@ -266,6 +266,8 @@
       * convertions to s?
       */
      public boolean isConvertible(Type t, Type s, Warner warn) {
 +        if (s.tsym == syms.dynamicType.tsym) return true;
++        if (t.tsym == syms.dynamicType.tsym && s.tsym == syms.objectType.tsym) return true;
          boolean tPrimitive = t.isPrimitive();
          boolean sPrimitive = s.isPrimitive();
          if (tPrimitive == sPrimitive)
-@@ -893,6 +894,8 @@
+@@ -893,6 +895,8 @@
          if (t == s)
              return true;
  
@@ -44,7 +45,7 @@ diff --git a/src/share/classes/com/sun/t
          if (t.isPrimitive() != s.isPrimitive())
              return allowBoxing && isConvertible(t, s, warn);
  
-@@ -1495,6 +1498,7 @@
+@@ -1495,6 +1499,7 @@
       * (not defined for Method and ForAll types)
       */
      public boolean isAssignable(Type t, Type s, Warner warn) {

--- a/nb-javac/dyncast.patch	Thu Mar 26 19:55:19 2009 -0500
+++ b/nb-javac/dyncast.patch	Fri Mar 27 01:39:54 2009 -0500
@@ -27,15 +27,16 @@ diff --git a/src/share/classes/com/sun/t
 diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
 --- a/src/share/classes/com/sun/tools/javac/code/Types.java
 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java
-@@ -269,6 +269,7 @@
+@@ -269,6 +269,8 @@
       * convertions to s?
       */
      public boolean isConvertible(Type t, Type s, Warner warn) {
 +        if (s.tsym == syms.dynamicType.tsym) return true;
++        if (t.tsym == syms.dynamicType.tsym && s.tsym == syms.objectType.tsym) return true;
          boolean tPrimitive = t.isPrimitive();
          boolean sPrimitive = s.isPrimitive();
          if (tPrimitive == sPrimitive)
-@@ -879,6 +880,8 @@
+@@ -879,6 +881,8 @@
          if (t == s)
              return true;
  
@@ -44,7 +45,7 @@ diff --git a/src/share/classes/com/sun/t
          if (t.isPrimitive() != s.isPrimitive())
              return allowBoxing && isConvertible(t, s, warn);
  
-@@ -1472,6 +1475,7 @@
+@@ -1472,6 +1476,7 @@
       * (not defined for Method and ForAll types)
       */
      public boolean isAssignable(Type t, Type s, Warner warn) {