From aad12650ea7394e315ebe170ceebb345c739577d Mon Sep 17 00:00:00 2001
From: Runemoro
Date: Sat, 18 Apr 2020 09:02:12 -0400
Subject: Fix a few bugs (#219)

* Update Gradle and replace deprecated Gradle features

* Allow naming class in default package (fixes #215)

* Fix CFR crash (fixes #207)

* Update README.md

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>---
 src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/cuchaz/enigma/source/cfr')

diff --git a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
index e265d9d..09e0a9b 100644
--- a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
+++ b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
@@ -43,7 +43,13 @@ public class EnigmaDumper implements Dumper {
     }
 
     private String getDesc(JavaTypeInstance type) {
-        type = type.getDeGenerifiedType();
+        if (!type.isUsableType() && type != RawJavaType.VOID) {
+            throw new IllegalArgumentException(type.toString());
+        }
+
+        if (type instanceof JavaGenericBaseInstance) {
+            return getDesc(type.getDeGenerifiedType());
+        }
 
         if (type instanceof JavaRefTypeInstance) {
             return "L" + type.getRawName().replace('.', '/') + ";";
-- 
cgit v1.2.3