Revert "Bump to mono/cecil/master@cb6c1ca (#462)"

radekdoulik · radekdoulik · commit 2abfc1e06a64 · 2019-08-13T20:42:12.000+02:00
This reverts commit 807ed48. This change doesn't play well with XA/master branch, because it uses older cecil version without the API break. I have created mono-2019-08 branch here in Java.Interop for mono/2019-08 specific changes for dotnet/android#3449 integration PR. Changes from mono-2019-08 branch (plus this reverted bump) could be merged to master, once the integration PR is merged to XA.
diff --git a/external/cecil b/external/cecil
@@ -1 +1 @@
-Subproject commit cb6c1ca9aaef869841bfc3e2e7407b81b979b875
+Subproject commit a6c8f5e1070d25c38cbfaa415d6f6853e5236687
diff --git a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/MethodDefinitionRocks.cs b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/MethodDefinitionRocks.cs
@@ -110,7 +110,7 @@ static bool IsParameterCompatibleWith (TypeReference a, TypeReference b)
 					return true;
 				var gpa = (GenericParameter) a;
 				foreach (var c in gpa.Constraints) {
-					if (!c.ConstraintType.IsAssignableFrom (b))
+					if (!c.IsAssignableFrom (b))
 						return false;
 				}
 				return true;
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenericParameterDefinition.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenericParameterDefinition.cs
@@ -72,7 +72,7 @@ public static GenericParameterDefinitionList FromMetadata (IEnumerable<GenericPa
 				ret.Add (new GenericParameterDefinition (
 					p.FullNameCorrected (),
 					(from a in p.Constraints
-					 select a.ConstraintType.FullNameCorrected ()).ToArray ()));
+					 select a.FullNameCorrected ()).ToArray ()));
 			}
 			return ret;
 		}

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ static bool IsParameterCompatibleWith (TypeReference a, TypeReference b)`
`110`	`110`	`return true;`
`111`	`111`	`var gpa = (GenericParameter) a;`
`112`	`112`	`foreach (var c in gpa.Constraints) {`
`113`		`- if (!c.ConstraintType.IsAssignableFrom (b))`
	`113`	`+ if (!c.IsAssignableFrom (b))`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static GenericParameterDefinitionList FromMetadata (IEnumerable<GenericPa`
`72`	`72`	`ret.Add (new GenericParameterDefinition (`
`73`	`73`	`p.FullNameCorrected (),`
`74`	`74`	`(from a in p.Constraints`
`75`		`- select a.ConstraintType.FullNameCorrected ()).ToArray ()));`
	`75`	`+ select a.FullNameCorrected ()).ToArray ()));`
`76`	`76`	`}`
`77`	`77`	`return ret;`
`78`	`78`	`}`