From d492675c3f64bc57461078fb8950a48403b1790a Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Mon, 26 Apr 2021 14:38:14 -0500 Subject: [PATCH] [XAT.Bytecode] Fix issue where Kotlin public types inside internal types were not being hidden. --- .../Kotlin/KotlinFixups.cs | 30 ++++++++++++++---- .../KotlinFixupsTests.cs | 19 +++++++++++ ...estedInterface$DoubleNestedInterface.class | Bin 0 -> 612 bytes ...sWithNestedInterface$NestedInterface.class | Bin 0 -> 599 bytes .../InternalClassWithNestedInterface.class | Bin 0 -> 627 bytes .../InternalClassWithNestedInterface.kt | 5 +++ 6 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.kt diff --git a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs index 3ae27ebf2..60c4b8fa4 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs +++ b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs @@ -30,7 +30,7 @@ public static void Fixup (IList classes) var class_metadata = (metadata as KotlinClass); if (class_metadata != null) { - FixupClassVisibility (c, class_metadata); + FixupClassVisibility (c, class_metadata, classes); if (!c.AccessFlags.IsPubliclyVisible ()) continue; @@ -62,7 +62,7 @@ public static void Fixup (IList classes) } } - static void FixupClassVisibility (ClassFile klass, KotlinClass metadata) + static void FixupClassVisibility (ClassFile klass, KotlinClass metadata, IList classes) { // Hide class if it isn't Public/Protected if (klass.AccessFlags.IsPubliclyVisible () && !metadata.Visibility.IsPubliclyVisible ()) { @@ -83,15 +83,33 @@ static void FixupClassVisibility (ClassFile klass, KotlinClass metadata) Log.Debug ($"Kotlin: Hiding internal class {klass.ThisClass.Name.Value}"); klass.AccessFlags = SetVisibility (klass.AccessFlags, ClassAccessFlags.Private); - foreach (var ic in klass.InnerClasses) { - Log.Debug ($"Kotlin: Hiding nested internal type {ic.InnerClass.Name.Value}"); - ic.InnerClassAccessFlags = SetVisibility (ic.InnerClassAccessFlags, ClassAccessFlags.Private); - } + foreach (var ic in klass.InnerClasses) + HideInternalInnerClass (ic, classes); return; } } + static void HideInternalInnerClass (InnerClassInfo klass, IList classes) + { + var existing = klass.InnerClassAccessFlags; + + klass.InnerClassAccessFlags = SetVisibility (existing, ClassAccessFlags.Private); + Log.Debug ($"Kotlin: Hiding nested internal type {klass.InnerClass.Name.Value}"); + + // Setting the inner class access flags above doesn't technically do anything, because we output + // from the inner class's ClassFile, so we need to find that and set it there. + var kf = classes.FirstOrDefault (c => c.ThisClass.Name.Value == klass.InnerClass.Name.Value); + + if (kf != null) { + kf.AccessFlags = SetVisibility (kf.AccessFlags, ClassAccessFlags.Private); + kf.InnerClass.InnerClassAccessFlags = SetVisibility (kf.InnerClass.InnerClassAccessFlags, ClassAccessFlags.Private); + + foreach (var inner_class in kf.InnerClasses.Where (c => c.OuterClass.Name.Value == kf.ThisClass.Name.Value)) + HideInternalInnerClass (inner_class, classes); + } + } + // Passing null for 'newVisibility' parameter means 'package-private' static ClassAccessFlags SetVisibility (ClassAccessFlags existing, ClassAccessFlags? newVisibility) { diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs index 39841abe2..d8d7396dd 100644 --- a/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs @@ -310,5 +310,24 @@ public void HandleKotlinNameShadowing () Assert.True (klass.Methods.Single (m => m.Name == "hitCount").AccessFlags.HasFlag (MethodAccessFlags.Public)); Assert.True (klass.Methods.Single (m => m.Name == "setType").AccessFlags.HasFlag (MethodAccessFlags.Public)); } + + [Test] + public void HidePublicInterfaceInInternalClass () + { + var klass = LoadClassFile ("InternalClassWithNestedInterface.class"); + var inner_interface = LoadClassFile ("InternalClassWithNestedInterface$NestedInterface.class"); + var inner_inner_interface = LoadClassFile ("InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class"); + + KotlinFixups.Fixup (new [] { klass, inner_interface, inner_inner_interface }); + + var output = new XmlClassDeclarationBuilder (klass).ToXElement ().ToString (); + Assert.True (output.Contains ("visibility=\"public\"")); + + var output2 = new XmlClassDeclarationBuilder (inner_interface).ToXElement ().ToString (); + Assert.True (output2.Contains ("visibility=\"private\"")); + + var output3 = new XmlClassDeclarationBuilder (inner_inner_interface).ToXElement ().ToString (); + Assert.True (output3.Contains ("visibility=\"private\"")); + } } } diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..e27a40add46a30f2db2aa7a4511c39b462b1b2da GIT binary patch literal 612 zcmb_ZO-lnY5Pg%?Zo7W;L#wTN5cKTU9`z(jaiJH<}ysDdzDxtV!BH?6J z-PzC)HX~!yI9r&qgy1QijC-o36Gf;$PK?td^{lPtHC-8#I_Y$3Y>s`y8auo=9_kz` z%n0mYH&@`ehkecm%nQ_T$oYbeS?8PUz>DB#FOR|x3L_AwQEXv;s C>Za8I literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..ad2e8205be74411cfa025c2d6fca7fafcf39dacd GIT binary patch literal 599 zcmb7B%T59@6g_uF85kct6a{f%B5S}|YFro%$t0+WCc0o%plD&}B($*RyIdI7ew6Xf zByP}z(8s+!r@ha9eSdrc2yjYhh1$xg7SU}ajCob|{XrTl2Pr)ieOX_@9*9sFiMeP- zLccX1dn4Jm9$Z4PGmdSfbn{+XF%VW<5uC}~KCglI* zaK6s2F}8%=P-{6&KS&ya{~XVzec4u#BvhYf+Nz0sQATlV_uen{@JTqOmA-r^Dk^4n{h#gJ_9`?E*gMH-r%AjCS HG${Q5M&qDU literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..acfd9bfce1fcf6d68727927bb70e04fd6759a524 GIT binary patch literal 627 zcmaix&rTaL5XQgpCY!L`k^pT9Q2w`4%b|fB3qqwxNRa|afWjdsCoy2M@k(olbDpJd z&{L%zs;I|46zX^d7cQ}^Z~gmrW^9lDJ^ua!pn*-oM$(%Nh7?#`5Ts-N38 zvZqQQLiJug$a*5pZT-A^uX?V8fDj&Nqun7P`1H9Qqlhp<0VP7g-DykMYE3J?Pnc^B zQkQ5`KUGflrIYN5;X}X&Brg@lZjSKC+tPro{vP4uWE@ALCL&Rtj3ZGN<;l1<88^f( zeWl=g@$ZjNRD}<25LZLx#nlMA(+>FIMM?=Z!uGVRF9XL-I8OVDH*IO7&PKzo%C2NL zVQ0RT_GHqQnfCl-#!X{XmOp~x)