changeset 14053:99e71e40b111

8000241: langtools doesn't build Summary: bad merge with langtools tip caused build glitch Reviewed-by: jjg
author mcimadamore
date Fri, 28 Sep 2012 18:50:40 +0100
parents 8b839ae9074b
children 7ae16dd77c90
files langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java langtools/test/tools/javac/lambda/TestInvokeDynamic.java
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Fri Sep 28 16:56:53 2012 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Fri Sep 28 18:50:40 2012 +0100
@@ -493,7 +493,7 @@
                 } else {
                     //invokedynamic
                     DynamicMethodSymbol dynSym = (DynamicMethodSymbol)m;
-                    Pool.MethodHandle handle = new Pool.MethodHandle(dynSym.bsmKind, dynSym.bsm, names);
+                    Pool.MethodHandle handle = new Pool.MethodHandle(dynSym.bsmKind, dynSym.bsm);
                     bootstrapMethods.put(dynSym, handle);
                     //init cp entries
                     pool.put(names.BootstrapMethods);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Fri Sep 28 16:56:53 2012 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Fri Sep 28 18:50:40 2012 +0100
@@ -25,16 +25,14 @@
 
 package com.sun.tools.javac.jvm;
 
-import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.Kinds;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.Type;
 
+import com.sun.tools.javac.util.ArrayUtils;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.Filter;
 import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Names;
 
 import java.util.*;
 
--- a/langtools/test/tools/javac/lambda/TestInvokeDynamic.java	Fri Sep 28 16:56:53 2012 +0100
+++ b/langtools/test/tools/javac/lambda/TestInvokeDynamic.java	Fri Sep 28 18:50:40 2012 +0100
@@ -160,7 +160,7 @@
                 case CLASS:
                     return syms.stringType.tsym;
                 case METHOD_HANDLE:
-                    return new Pool.MethodHandle(REF_invokeVirtual, syms.arrayCloneMethod, names);
+                    return new Pool.MethodHandle(REF_invokeVirtual, syms.arrayCloneMethod);
                 case METHOD_TYPE:
                     return syms.arrayCloneMethod.type;
                 default: