infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8000241: langtools doesn't build

Browse Source 
Bad merge with langtools tip caused build glitch

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2012-09-28 18:50:40 +01:00
parent 7f58c7c7ad
commit 8fbd614bf3
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
View File

@ -493,7 +493,7 @@ public class ClassWriter extends ClassFile {
} 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);

4
langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
View File

@ -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.*;

2
langtools/test/tools/javac/lambda/TestInvokeDynamic.java
View File

@ -160,7 +160,7 @@ public class TestInvokeDynamic {
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: