azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using CheckSignatureAdapter in ultra-light classes

Browse Source
This commit is contained in:
Denis Zharkov
2018-11-16 12:33:06 +03:00
parent 037ad2923c
commit ce3b489fa9
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java
+13 -4
View File
@@ -31,11 +31,16 @@ public class BothSignatureWriter extends JvmSignatureWriter {
public enum Mode { public enum Mode {
METHOD(CheckSignatureAdapter.METHOD_SIGNATURE), METHOD(CheckSignatureAdapter.METHOD_SIGNATURE),
CLASS(CheckSignatureAdapter.CLASS_SIGNATURE), CLASS(CheckSignatureAdapter.CLASS_SIGNATURE),
TYPE(CheckSignatureAdapter.TYPE_SIGNATURE); TYPE(CheckSignatureAdapter.TYPE_SIGNATURE),
// Expected to be used only from light classes for type mapping
// It's needed because CheckSignatureAdapter.TYPE_SIGNATURE doesn't allow V (void) types.
// They're only allowed with CheckSignatureAdapter.METHOD_SIGNATURE after calling `visitReturnType` while in light classes,
// we only need to map distinct types
SKIP_CHECKS(null);
private final int asmType; private final Integer asmType;
Mode(int asmType) { Mode(Integer asmType) {
this.asmType = asmType; this.asmType = asmType;
} }
} }
@@ -46,7 +51,11 @@ public class BothSignatureWriter extends JvmSignatureWriter {
private boolean generic = false; private boolean generic = false;
public BothSignatureWriter(@NotNull Mode mode) { public BothSignatureWriter(@NotNull Mode mode) {
this.signatureVisitor = new CheckSignatureAdapter(mode.asmType, signatureWriter); this.signatureVisitor =
mode.asmType != null
? new CheckSignatureAdapter(mode.asmType, signatureWriter)
: signatureWriter
;
} }
private final Stack<SignatureVisitor> visitors = new Stack<>(); private final Stack<SignatureVisitor> visitors = new Stack<>();
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
+1 -1
View File
@@ -85,7 +85,7 @@ internal fun UltraLightSupport.mapType(
psiContext: PsiElement, psiContext: PsiElement,
mapTypeToSignatureWriter: (KotlinTypeMapper, JvmSignatureWriter) -> Unit mapTypeToSignatureWriter: (KotlinTypeMapper, JvmSignatureWriter) -> Unit
): PsiType { ): PsiType {
val signatureWriter = BothSignatureWriter(BothSignatureWriter.Mode.TYPE) val signatureWriter = BothSignatureWriter(BothSignatureWriter.Mode.SKIP_CHECKS)
mapTypeToSignatureWriter(typeMapper(this), signatureWriter) mapTypeToSignatureWriter(typeMapper(this), signatureWriter)
val signature = StringCharacterIterator(signatureWriter.toString()) val signature = StringCharacterIterator(signatureWriter.toString())