--- a/tailc.patch Tue Jun 02 23:42:30 2009 -0700
+++ b/tailc.patch Fri Jun 12 15:05:04 2009 -0700
@@ -1,6 +1,6 @@ diff -r 2c0076945b1a src/share/classes/c
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/comp/Lower.java
---- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Mar 16 11:46:59 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/comp/Lower.java
+--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jun 04 10:19:02 2009 +0200
@@ -421,7 +421,7 @@ public class Lower extends TreeTranslato
forEnum.type,
List.<Type>nil());
@@ -173,7 +173,7 @@ diff -r 2c0076945b1a src/share/classes/c
if (tree.var.type.isPrimitive())
vardefinit = make.TypeCast(types.upperBound(iteratorTarget), vardefinit);
else
-@@ -3103,7 +3110,8 @@ public class Lower extends TreeTranslato
+@@ -3104,7 +3111,8 @@ public class Lower extends TreeTranslato
List.<Type>nil());
JCArrayAccess selector = make.Indexed(map.mapVar,
make.App(make.Select(tree.selector,
@@ -183,9 +183,9 @@ diff -r 2c0076945b1a src/share/classes/c
ListBuffer<JCCase> cases = new ListBuffer<JCCase>();
for (JCCase c : tree.cases) {
if (c.pat != null) {
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
---- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Mar 16 11:46:59 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu Jun 04 10:19:03 2009 +0200
@@ -1108,6 +1108,6 @@ public class MemberEnter extends JCTree.
meth = make.Ident(names._super);
}
@@ -194,9 +194,9 @@ diff -r 2c0076945b1a src/share/classes/c
+ return make.Exec(make.Apply(typeargs, meth, make.Idents(params), false));
}
}
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/comp/TransTypes.java
---- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Mar 16 11:47:00 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Jun 04 10:19:03 2009 +0200
@@ -239,7 +239,8 @@ public class TransTypes extends TreeTran
make.Apply(
null,
@@ -207,10 +207,10 @@ diff -r 2c0076945b1a src/share/classes/c
.setType(calltype);
JCStatement stat = (origErasure.getReturnType().tag == VOID)
? make.Exec(call)
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/jvm/Gen.java
---- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Mar 16 11:47:00 2009 +0100
-@@ -346,8 +346,8 @@ public class Gen extends JCTree.Visitor
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/jvm/Gen.java
+--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jun 04 10:19:03 2009 +0200
+@@ -348,8 +348,8 @@ public class Gen extends JCTree.Visitor
boolean isStatic) {
Symbol msym = rs.
resolveInternalMethod(pos, attrEnv, site, name, argtypes, null);
@@ -221,7 +221,7 @@ diff -r 2c0076945b1a src/share/classes/c
}
/** Is the given method definition an access method
-@@ -1677,7 +1677,7 @@ public class Gen extends JCTree.Visitor
+@@ -1679,7 +1679,7 @@ public class Gen extends JCTree.Visitor
// outer instance of a super(...) call appears as first parameter).
genArgs(tree.args,
TreeInfo.symbol(tree.meth).externalType(types).getParameterTypes());
@@ -230,7 +230,7 @@ diff -r 2c0076945b1a src/share/classes/c
}
public void visitConditional(JCConditional tree) {
-@@ -1718,7 +1718,7 @@ public class Gen extends JCTree.Visitor
+@@ -1720,7 +1720,7 @@ public class Gen extends JCTree.Visitor
// any implicit outer instance appears as first parameter).
genArgs(tree.args, tree.constructor.externalType(types).getParameterTypes());
@@ -239,7 +239,7 @@ diff -r 2c0076945b1a src/share/classes/c
result = items.makeStackItem(tree.type);
}
-@@ -1961,7 +1961,7 @@ public class Gen extends JCTree.Visitor
+@@ -1963,7 +1963,7 @@ public class Gen extends JCTree.Visitor
if (t.tag > lastBaseTag && t.tsym != syms.stringType.tsym) {
t = syms.objectType;
}
@@ -248,10 +248,10 @@ diff -r 2c0076945b1a src/share/classes/c
}
Symbol getStringBufferAppend(JCTree tree, Type t) {
assert t.constValue() == null;
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/jvm/Items.java
---- a/src/share/classes/com/sun/tools/javac/jvm/Items.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java Mon Mar 16 11:47:00 2009 +0100
-@@ -207,7 +207,7 @@ public class Items {
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/jvm/Items.java
+--- a/src/share/classes/com/sun/tools/javac/jvm/Items.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java Thu Jun 04 10:19:03 2009 +0200
+@@ -214,7 +214,7 @@ public class Items {
/** Generate code to invoke method represented by this item.
*/
@@ -260,7 +260,7 @@ diff -r 2c0076945b1a src/share/classes/c
throw new AssertionError(this);
}
-@@ -445,9 +445,10 @@ public class Items {
+@@ -452,9 +452,10 @@ public class Items {
code.emitop2(putstatic, pool.put(member));
}
@@ -272,7 +272,7 @@ diff -r 2c0076945b1a src/share/classes/c
code.emitInvokestatic(pool.put(member), mtype);
return stackItem[rescode];
}
-@@ -484,9 +485,10 @@ public class Items {
+@@ -523,9 +524,10 @@ public class Items {
code.emitop2(putfield, pool.put(member));
}
@@ -284,9 +284,9 @@ diff -r 2c0076945b1a src/share/classes/c
if ((member.owner.flags() & Flags.INTERFACE) != 0) {
code.emitInvokeinterface(pool.put(member), mtype);
} else if (nonvirtual) {
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/parser/JavacParser.java
---- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Mon Mar 16 11:47:00 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Jun 04 10:19:03 2009 +0200
@@ -656,7 +656,7 @@ public class JavacParser implements Pars
* TypeNoParams2 = TypeNoParams3
*/
@@ -419,7 +419,7 @@ diff -r 2c0076945b1a src/share/classes/c
typeArgs = null;
break loop;
case NEW:
-@@ -1069,7 +1075,7 @@ public class JavacParser implements Pars
+@@ -1075,7 +1081,7 @@ public class JavacParser implements Pars
mode = EXPR;
t = to(F.at(pos1).Select(t, names._super));
S.nextToken();
@@ -428,7 +428,7 @@ diff -r 2c0076945b1a src/share/classes/c
typeArgs = null;
} else if (S.token() == NEW && (mode & EXPR) != 0) {
if (typeArgs != null) return illegal();
-@@ -1081,7 +1087,7 @@ public class JavacParser implements Pars
+@@ -1087,7 +1093,7 @@ public class JavacParser implements Pars
typeArgs = null;
} else {
t = toP(F.at(pos1).Select(t, ident()));
@@ -437,7 +437,7 @@ diff -r 2c0076945b1a src/share/classes/c
typeArgs = null;
}
} else {
-@@ -1099,16 +1105,16 @@ public class JavacParser implements Pars
+@@ -1105,16 +1111,16 @@ public class JavacParser implements Pars
/** SuperSuffix = Arguments | "." [TypeArguments] Ident [Arguments]
*/
@@ -457,7 +457,7 @@ diff -r 2c0076945b1a src/share/classes/c
}
return t;
}
-@@ -1123,10 +1129,10 @@ public class JavacParser implements Pars
+@@ -1129,10 +1135,10 @@ public class JavacParser implements Pars
/** ArgumentsOpt = [ Arguments ]
*/
@@ -470,7 +470,7 @@ diff -r 2c0076945b1a src/share/classes/c
} else {
return t;
}
-@@ -1152,10 +1158,10 @@ public class JavacParser implements Pars
+@@ -1158,10 +1164,10 @@ public class JavacParser implements Pars
return args.toList();
}
@@ -483,9 +483,9 @@ diff -r 2c0076945b1a src/share/classes/c
}
/** TypeArgumentsOpt = [ TypeArguments ]
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/tree/JCTree.java
---- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java Mon Mar 16 11:47:00 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/tree/JCTree.java
+--- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu Jun 04 10:19:03 2009 +0200
@@ -1280,14 +1280,17 @@ public abstract class JCTree implements
public JCExpression meth;
public List<JCExpression> args;
@@ -523,9 +523,9 @@ diff -r 2c0076945b1a src/share/classes/c
JCNewClass NewClass(JCExpression encl,
List<JCExpression> typeargs,
JCExpression clazz,
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
---- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Mon Mar 16 11:47:00 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
+--- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Thu Jun 04 10:19:03 2009 +0200
@@ -244,7 +244,7 @@ public class TreeCopier<P> implements Tr
List<JCExpression> typeargs = copy(t.typeargs, p);
JCExpression meth = copy(t.meth, p);
@@ -535,9 +535,9 @@ diff -r 2c0076945b1a src/share/classes/c
}
public JCTree visitModifiers(ModifiersTree node, P p) {
-diff -r 2c0076945b1a src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
---- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Mon Mar 09 13:34:19 2009 -0700
-+++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Mon Mar 16 11:47:00 2009 +0100
+diff -r 0f653be1a42f src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+--- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Thu May 14 10:58:12 2009 -0700
++++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Thu Jun 04 10:19:03 2009 +0200
@@ -318,9 +318,10 @@ public class TreeMaker implements JCTree
public JCMethodInvocation Apply(List<JCExpression> typeargs,