keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #2423 from Mumfrey/fix/jdt

Browse source 
Fix ASM SignatureReader choking on invalid lambda local var signatures emitted by JDT
This commit is contained in:
LexManos 2016-02-04 12:34:04 -06:00
commit 8af1624f9e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
View file

@ -314,6 +314,17 @@ public class FMLDeobfuscatingRemapper extends Remapper {
return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name;
}
@Override
public String mapSignature(String signature, boolean typeSignature)
{
// JDT decorates some lambdas with this and SignatureReader chokes on it
if (signature != null && signature.contains("!*"))
{
return null;
}
return super.mapSignature(signature, typeSignature);
}
private Map<String,String> getFieldMap(String className)
{
if (!fieldNameMaps.containsKey(className) && !negativeCacheFields.contains(className))