Add Kotlin support to our binding process.

Author: jpobst

src/Xamarin.Android.Tools.Bytecode/ClassPath.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -8,7 +8,6 @@
 using System.Xml.Linq;
 using System.Xml.XPath;
 using System.Text;
-using Xamarin.Android.Tools.Bytecode.Kotlin;
 
 namespace Xamarin.Android.Tools.Bytecode {
 

src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinClassMetadata.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using org.jetbrains.kotlin.metadata.jvm;
 using Type = org.jetbrains.kotlin.metadata.jvm.Type;
 
@@ -48,23 +49,34 @@ internal static KotlinClass FromProtobuf (Class c, JvmNameResolver resolver)
 		}
 	}
 
-	public class KotlinConstructor
+	public class KotlinMethodBase
 	{
-		public int Flags { get; set; }
-		public List<KotlinValueParameter> ValueParameters { get; set; }
 		public int [] VersionRequirements { get; set; }
 
+		public virtual string GetSignature () => string.Empty;
+	}
+
+	public class KotlinConstructor : KotlinMethodBase
+	{
+		public KotlinConstructorFlags Flags { get; set; }
+		public List<KotlinValueParameter> ValueParameters { get; set; }
+
 		internal static KotlinConstructor FromProtobuf (Constructor c, JvmNameResolver resolver)
 		{
 			if (c is null)
 				return null;
 
 			return new KotlinConstructor {
-				Flags = c.Flags,
+				Flags = (KotlinConstructorFlags)c.Flags,
 				ValueParameters = c.ValueParameters?.Select (vp => KotlinValueParameter.FromProtobuf (vp, resolver)).ToList (),
 				VersionRequirements = c.VersionRequirements
 			};
 		}
+
+		public override string GetSignature ()
+		{
+			return $"({ValueParameters.GetSignature ()})V";
+		}
 	}
 
 	public class KotlinAnnotation
@@ -113,7 +125,7 @@ public class KotlinAnnotationArgumentValue
 		public KotlinAnnotation Annotation { get; set; }
 		public List<KotlinAnnotationArgumentValue> ArrayElements { get; set; }
 		public int ArrayDimensionCount { get; set; }
-		public int Flags { get; set; }
+		public KotlinAnnotationFlags Flags { get; set; }
 
 		internal static KotlinAnnotationArgumentValue FromProtobuf (org.jetbrains.kotlin.metadata.jvm.Annotation.Argument.Value value, JvmNameResolver resolver)
 		{
@@ -131,7 +143,7 @@ internal static KotlinAnnotationArgumentValue FromProtobuf (org.jetbrains.kotlin
 				Annotation = KotlinAnnotation.FromProtobuf (value.Annotation, resolver),
 				ArrayDimensionCount = value.ArrayDimensionCount,
 				ArrayElements = value.ArrayElements?.Select (vp => KotlinAnnotationArgumentValue.FromProtobuf (vp, resolver)).ToList (),
-				Flags = value.Flags
+				Flags = (KotlinAnnotationFlags)value.Flags
 			};
 		}
 	}
@@ -159,7 +171,7 @@ internal static KotlinEffect FromProtobuf (Effect ef, JvmNameResolver resolver)
 
 	public class KotlinExpression
 	{
-		public int Flags { get; set; }
+		public KotlinExpressionFlags Flags { get; set; }
 		public int ValueParameterReference { get; set; }
 		public KotlinConstantValue ConstantValue { get; set; }
 		public KotlinType IsInstanceType { get; set; }
@@ -173,7 +185,7 @@ internal static KotlinExpression FromProtobuf (Expression exp, JvmNameResolver r
 				return null;
 
 			return new KotlinExpression {
-				Flags = exp.Flags,
+				Flags = (KotlinExpressionFlags)exp.Flags,
 				ValueParameterReference = exp.ValueParameterReference,
 				ConstantValue = (KotlinConstantValue) exp.constant_value,
 				IsInstanceType = KotlinType.FromProtobuf (exp.IsInstanceType, resolver),
@@ -184,27 +196,26 @@ internal static KotlinExpression FromProtobuf (Expression exp, JvmNameResolver r
 		}
 	}
 
-	public class KotlinFunction
+	public class KotlinFunction : KotlinMethodBase
 	{
-		public int Flags { get; set; }
 		public string Name { get; set; }
+		public KotlinFunctionFlags Flags { get; set; }
 		public KotlinType ReturnType { get; set; }
 		public int ReturnTypeId { get; set; }
 		public List<KotlinTypeParameter> TypeParameters { get; set; }
 		public KotlinType ReceiverType { get; set; }
 		public int ReceiverTypeId { get; set; }
-		public List<KotlinValueParameter> ValueParameters { get; set; }
 		public KotlinTypeTable TypeTable { get; set; }
-		public int [] VersionRequirements { get; set; }
 		public KotlinContract Contract { get; set; }
+		public List<KotlinValueParameter> ValueParameters { get; set; }
 
 		internal static KotlinFunction FromProtobuf (Function f, JvmNameResolver resolver)
 		{
 			if (f is null)
 				return null;
 
 			return new KotlinFunction {
-				Flags = f.Flags,
+				Flags = (KotlinFunctionFlags)f.Flags,
 				Name = resolver.GetString (f.Name),
 				ReturnType = KotlinType.FromProtobuf (f.ReturnType, resolver),
 				ReturnTypeId = f.ReturnTypeId,
@@ -215,6 +226,8 @@ internal static KotlinFunction FromProtobuf (Function f, JvmNameResolver resolve
 				VersionRequirements = f.VersionRequirements
 			};
 		}
+
+		public override string ToString () => Name;
 	}
 
 	public class KotlinContract
@@ -229,10 +242,10 @@ internal static KotlinContract FromProtobuf (Contract c, JvmNameResolver resolve
 		}
 	}
 
-	public class KotlinProperty
+	public class KotlinProperty : KotlinMethodBase
 	{
-		public int Flags { get; set; }
 		public string Name { get; set; }
+		public KotlinPropertyFlags Flags { get; set; }
 		public KotlinType ReturnType { get; set; }
 		public int ReturnTypeId { get; set; }
 		public List<KotlinTypeParameter> TypeParameters { get; set; }
@@ -241,15 +254,14 @@ public class KotlinProperty
 		public KotlinValueParameter SetterValueParameter { get; set; }
 		public int GetterFlags { get; set; }
 		public int SetterFlags { get; set; }
-		public int [] VersionRequirements { get; set; }
 
 		internal static KotlinProperty FromProtobuf (Property p, JvmNameResolver resolver)
 		{
 			if (p is null)
 				return null;
 
 			return new KotlinProperty {
-				Flags = p.Flags,
+				Flags = (KotlinPropertyFlags)p.Flags,
 				Name = resolver.GetString (p.Name),
 				ReturnTypeId = p.ReturnTypeId,
 				ReturnType = KotlinType.FromProtobuf (p.ReturnType, resolver),
@@ -268,18 +280,18 @@ public class KotlinType
 	{
 		public List<KotlinTypeArgument> Arguments { get; set; }
 		public bool Nullable { get; set; }
-		public int FlexibleTypeCapabilitiesId { get; set; }
+		public int? FlexibleTypeCapabilitiesId { get; set; }
 		public KotlinType FlexibleUpperBound { get; set; }
 		public int FlexibleUpperBoundId { get; set; }
 		public string ClassName { get; set; }
-		public int TypeParameter { get; set; }
+		public int? TypeParameter { get; set; }
 		public string TypeParameterName { get; set; }
 		public string TypeAliasName { get; set; }
 		public KotlinType OuterType { get; set; }
-		public int OuterTypeId { get; set; }
+		public int? OuterTypeId { get; set; }
 		public KotlinType AbbreviatedType { get; set; }
-		public int AbbreviatedTypeId { get; set; }
-		public int Flags { get; set; }
+		public int? AbbreviatedTypeId { get; set; }
+		public KotlinTypeFlags Flags { get; set; }
 
 		internal static KotlinType FromProtobuf (Type t, JvmNameResolver resolver)
 		{
@@ -291,16 +303,21 @@ internal static KotlinType FromProtobuf (Type t, JvmNameResolver resolver)
 				Nullable = t.Nullable,
 				FlexibleTypeCapabilitiesId = t.FlexibleTypeCapabilitiesId,
 				FlexibleUpperBound = FromProtobuf (t.FlexibleUpperBound, resolver),
-				ClassName = t.ClassName > 0 ? resolver.GetString (t.ClassName) : null,
+				ClassName = t.ClassName >= 0 ? resolver.GetString (t.ClassName.Value) : null,
 				TypeParameter = t.TypeParameter,
-				TypeParameterName = t.TypeParameterName > 0 ? resolver.GetString (t.TypeParameterName) : null,
+				TypeParameterName = t.TypeParameterName >= 0 ? resolver.GetString (t.TypeParameterName.GetValueOrDefault ()) : null,
 				OuterType = FromProtobuf (t.OuterType, resolver),
 				OuterTypeId = t.OuterTypeId,
 				AbbreviatedType = FromProtobuf (t.AbbreviatedType, resolver),
 				AbbreviatedTypeId = t.AbbreviatedTypeId,
-				Flags = t.Flags
+				Flags = (KotlinTypeFlags)t.Flags
 			};
 		}
+
+		public string GetSignature ()
+		{
+			return KotlinUtilities.ConvertKotlinTypeSignature (this);
+		}
 	}
 
 	public class KotlinTypeAlias
@@ -436,7 +453,7 @@ internal static KotlinVersionRequirementTable FromProtobuf (VersionRequirementTa
 
 	public class KotlinValueParameter
 	{
-		public int Flags { get; set; }
+		public KotlinParameterFlags Flags { get; set; }
 		public string Name { get; set; }
 		public KotlinType Type { get; set; }
 		public int TypeId { get; set; }
@@ -449,14 +466,16 @@ internal static KotlinValueParameter FromProtobuf (ValueParameter vp, JvmNameRes
 				return null;
 
 			return new KotlinValueParameter {
-				Flags = vp.Flags,
+				Flags = (KotlinParameterFlags)vp.Flags,
 				Name = resolver.GetString (vp.Name),
 				Type = KotlinType.FromProtobuf (vp.Type, resolver),
 				TypeId = vp.TypeId,
 				VarArgElementType = KotlinType.FromProtobuf (vp.VarargElementType, resolver),
 				VarArgElementTypeId = vp.VarargElementTypeId
 			};
 		}
+
+		public string GetSignature () => Type.GetSignature ();
 	}
 
 	public enum KotlinVariance
@@ -557,4 +576,134 @@ public enum KotlinClassFlags
 		IsExpectClass =		0b_01000_000_00_000_0,
 		IsInlineClass =		0b_10000_000_00_000_0
 	}
+
+	[Flags]
+	public enum KotlinConstructorFlags
+	{
+		HasAnnotations =	0b0_000_1,
+
+		Internal =		0b0_000_0,
+		Private =		0b0_001_0,
+		Protected =		0b0_010_0,
+		Public =		0b0_011_0,
+		PrivateToThis =		0b0_100_0,
+		Local =			0b0_101_0,
+
+		IsSecondary =		0b1_000_0
+	}
+
+	[Flags]
+	public enum KotlinFunctionFlags
+	{
+		HasAnnotations =	0b00_00_000_1,
+
+		Internal =		0b00_00_000_0,
+		Private =		0b00_00_001_0,
+		Protected =		0b00_00_010_0,
+		Public =		0b00_00_011_0,
+		PrivateToThis =		0b00_00_100_0,
+		Local =			0b00_00_101_0,
+
+		Final =			0b00_00_000_0,
+		Open =			0b00_01_000_0,
+		Abstract =		0b00_10_000_0,
+		Sealed =		0b00_11_000_0,
+
+		Declaration =		0b00_00_000_0,
+		FakeOverride =		0b01_00_000_0,
+		Delegation =		0b10_00_000_0,
+		Synthesized =		0b11_00_000_0,
+
+		IsOperator =		0b_0000001_000_00_000_0,
+		IsInfix =		0b_0000010_000_00_000_0,
+		IsInline =		0b_0000100_000_00_000_0,
+		IsTailrec =		0b_0001000_000_00_000_0,
+		IsExternalFunction =	0b_0010000_000_00_000_0,
+		IsSuspend =		0b_0100000_000_00_000_0,
+		IsExpectFunction =	0b_1000000_000_00_000_0
+	}
+
+	[Flags]
+	public enum KotlinPropertyFlags
+	{
+		HasAnnotations =	0b00_00_000_1,
+
+		Internal =		0b00_00_000_0,
+		Private =		0b00_00_001_0,
+		Protected =		0b00_00_010_0,
+		Public =		0b00_00_011_0,
+		PrivateToThis =		0b00_00_100_0,
+		Local =			0b00_00_101_0,
+
+		Final =			0b00_00_000_0,
+		Open =			0b00_01_000_0,
+		Abstract =		0b00_10_000_0,
+		Sealed =		0b00_11_000_0,
+
+		Declaration =		0b00_00_000_0,
+		FakeOverride =		0b01_00_000_0,
+		Delegation =		0b10_00_000_0,
+		Synthesized =		0b11_00_000_0,
+
+		IsVar =			0b_000000001_000_00_000_0,
+		HasGetter =		0b_000000010_000_00_000_0,
+		HasSetter =		0b_000000100_000_00_000_0,
+		IsConst =		0b_000001000_000_00_000_0,
+		IsLateInit =		0b_000010000_000_00_000_0,
+		HasConstant =		0b_000100000_000_00_000_0,
+		IsExternalProperty =	0b_001000000_000_00_000_0,
+		IsDelegated =		0b_010000000_000_00_000_0,
+		IsExpectProperty =	0b_100000000_000_00_000_0
+	}
+
+	[Flags]
+	public enum KotlinParameterFlags
+	{
+		HasAnnotations =	0b000_1,
+
+		DeclaresDefaultValue =	0b001_0,
+		IsCrossInline =		0b010_0,
+		IsNoInline =		0b100_0
+	}
+
+	[Flags]
+	public enum KotlinAccessorFlags
+	{
+		HasAnnotations =	0b00_00_000_1,
+
+		Internal =		0b00_00_000_0,
+		Private =		0b00_00_001_0,
+		Protected =		0b00_00_010_0,
+		Public =		0b00_00_011_0,
+		PrivateToThis =		0b00_00_100_0,
+		Local =			0b00_00_101_0,
+
+		Final =			0b00_00_000_0,
+		Open =			0b00_01_000_0,
+		Abstract =		0b00_10_000_0,
+		Sealed =		0b00_11_000_0,
+
+		IsNotDefault =		0b001_00_000_0,
+		IsExternalAccessor =	0b010_00_000_0,
+		IsInlineAccessor =	0b100_00_000_0
+	}
+
+	[Flags]
+	public enum KotlinExpressionFlags
+	{
+		IsNegated =		0b01,
+		IsNullCheckPredicate =	0b10
+	}
+
+	[Flags]
+	public enum KotlinAnnotationFlags
+	{
+		IsUnsigned =		0b01
+	}
+
+	[Flags]
+	public enum KotlinTypeFlags
+	{
+		SuspendType =		0b01
+	}
 }