Skip to content

Commit 73096d9

Browse files
jpobstjonpryor
authored andcommitted
[Xamarin.Android.Tools.Bytecode] Honor Kotlin class visibility (#499)
The [Kotlin language][0] stores Kotlin-specific metadata within a [`RuntimeVisibleAnnotation` bytecode attribute blob][1] with a type name value of `Lkotlin/Metadata;`. The annotation can contain the following keys: * `k`: The kind of metadata annotation (required) * `mv`: The version of metadata (required) * `bv`: The version of the byte code (required) * `d1`: The encoded metadata (optional) * `d2`: Additional strings (optional) Add support for a kind value of `Class`. The `Class` metadata is encoded as an array of strings. First we have to decode the `d1` data into bytes using a variety of potential encodings. Once we have bytes, they are formatted as: * First byte - Length of the string table * optional additional bytes to encode length of string table * Protobuf encoded string data table is next `length` bytes * Remaining bytes are Protobuf encoded data The string data table provides an indexed lookup table used by the Protobuf metadata to retrieve strings from one of: * Directly encoded in the string table * The string array contained in the `d2` field * A predefined hardcoded string The Protobuf encoded data is relatively straightforward. All fields that would be strings are instead indexes into the string data table. It provides metadata about the class itself and every field/method/property/parameter/etc. for the class. Once the Protobuf data is parsed, we can use this information to influence the normal XML declarations that `class-parse` produces: * Respect the Kotlin class visibility: if the Kotlin metadata specifies visibility as `Kotlin-Private` or `Kotlin-Internal`, set e.g. `//class/@visibility` to `private`, which prevents the type from being emitted into the XML description. * Filter out non-bindable constructs: Kotlin has a lot of interesting non-Class constructs it uses `.class` files for. Since our code doesn't understand them yet they do not generate usable bindings for these constructs. Until we have completed our support for these constructs we mark them as `private` so we do not attempt to bind them. ~~ Protobuf Generation ~~ `src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinProtobufDefinition.cs` is generated by using [`protogen`][2], by providing Kotlin's [protobuf schema][3] as input. Note that `protogen` doesn't support `import`, so the input text provided to `protogen` will need to replace: import "core/metadata/src/ext_options.proto"; with the contents of [`core/metadata/src/ext_options.proto`][4], and replace import "core/metadata/src/metadata.proto"; with the contents of [`core/metadata/src/metadata.proto`][5]. The default `protogen` options were used to generate `KotlinProtobufDefinition.cs`. [0]: https://kotlinlang.org [1]: https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.16 [2]: https://protogen.marcgravell.com [3]: https://github.com/JetBrains/kotlin/blob/master/core/metadata.jvm/src/jvm_metadata.proto [4]: https://github.com/JetBrains/kotlin/blob/master/core/metadata/src/ext_options.proto [5]: https://github.com/JetBrains/kotlin/blob/master/core/metadata/src/metadata.proto
1 parent d4d173b commit 73096d9

22 files changed

+2827
-3
lines changed

ThirdPartyNotices.txt

+219
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
java.interop uses third-party libraries or other resources that may be
2+
distributed under licenses different than the java.interop software.
3+
4+
In the event that we accidentally failed to list a required notice, please
5+
bring it to our attention. Post an issue or email us:
6+
7+
8+
9+
The attached notices are provided for information only.
10+
11+
1. JetBrains/kotlin (https://github.com/JetBrains/kotlin/)
12+
13+
%% JetBrains/kotlin NOTICES AND INFORMATION BEGIN HERE
14+
======================================================
15+
16+
Apache License
17+
Version 2.0, January 2004
18+
http://www.apache.org/licenses/
19+
20+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
21+
22+
1. Definitions.
23+
24+
"License" shall mean the terms and conditions for use, reproduction,
25+
and distribution as defined by Sections 1 through 9 of this document.
26+
27+
"Licensor" shall mean the copyright owner or entity authorized by
28+
the copyright owner that is granting the License.
29+
30+
"Legal Entity" shall mean the union of the acting entity and all
31+
other entities that control, are controlled by, or are under common
32+
control with that entity. For the purposes of this definition,
33+
"control" means (i) the power, direct or indirect, to cause the
34+
direction or management of such entity, whether by contract or
35+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
36+
outstanding shares, or (iii) beneficial ownership of such entity.
37+
38+
"You" (or "Your") shall mean an individual or Legal Entity
39+
exercising permissions granted by this License.
40+
41+
"Source" form shall mean the preferred form for making modifications,
42+
including but not limited to software source code, documentation
43+
source, and configuration files.
44+
45+
"Object" form shall mean any form resulting from mechanical
46+
transformation or translation of a Source form, including but
47+
not limited to compiled object code, generated documentation,
48+
and conversions to other media types.
49+
50+
"Work" shall mean the work of authorship, whether in Source or
51+
Object form, made available under the License, as indicated by a
52+
copyright notice that is included in or attached to the work
53+
(an example is provided in the Appendix below).
54+
55+
"Derivative Works" shall mean any work, whether in Source or Object
56+
form, that is based on (or derived from) the Work and for which the
57+
editorial revisions, annotations, elaborations, or other modifications
58+
represent, as a whole, an original work of authorship. For the purposes
59+
of this License, Derivative Works shall not include works that remain
60+
separable from, or merely link (or bind by name) to the interfaces of,
61+
the Work and Derivative Works thereof.
62+
63+
"Contribution" shall mean any work of authorship, including
64+
the original version of the Work and any modifications or additions
65+
to that Work or Derivative Works thereof, that is intentionally
66+
submitted to Licensor for inclusion in the Work by the copyright owner
67+
or by an individual or Legal Entity authorized to submit on behalf of
68+
the copyright owner. For the purposes of this definition, "submitted"
69+
means any form of electronic, verbal, or written communication sent
70+
to the Licensor or its representatives, including but not limited to
71+
communication on electronic mailing lists, source code control systems,
72+
and issue tracking systems that are managed by, or on behalf of, the
73+
Licensor for the purpose of discussing and improving the Work, but
74+
excluding communication that is conspicuously marked or otherwise
75+
designated in writing by the copyright owner as "Not a Contribution."
76+
77+
"Contributor" shall mean Licensor and any individual or Legal Entity
78+
on behalf of whom a Contribution has been received by Licensor and
79+
subsequently incorporated within the Work.
80+
81+
2. Grant of Copyright License. Subject to the terms and conditions of
82+
this License, each Contributor hereby grants to You a perpetual,
83+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
84+
copyright license to reproduce, prepare Derivative Works of,
85+
publicly display, publicly perform, sublicense, and distribute the
86+
Work and such Derivative Works in Source or Object form.
87+
88+
3. Grant of Patent License. Subject to the terms and conditions of
89+
this License, each Contributor hereby grants to You a perpetual,
90+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
91+
(except as stated in this section) patent license to make, have made,
92+
use, offer to sell, sell, import, and otherwise transfer the Work,
93+
where such license applies only to those patent claims licensable
94+
by such Contributor that are necessarily infringed by their
95+
Contribution(s) alone or by combination of their Contribution(s)
96+
with the Work to which such Contribution(s) was submitted. If You
97+
institute patent litigation against any entity (including a
98+
cross-claim or counterclaim in a lawsuit) alleging that the Work
99+
or a Contribution incorporated within the Work constitutes direct
100+
or contributory patent infringement, then any patent licenses
101+
granted to You under this License for that Work shall terminate
102+
as of the date such litigation is filed.
103+
104+
4. Redistribution. You may reproduce and distribute copies of the
105+
Work or Derivative Works thereof in any medium, with or without
106+
modifications, and in Source or Object form, provided that You
107+
meet the following conditions:
108+
109+
(a) You must give any other recipients of the Work or
110+
Derivative Works a copy of this License; and
111+
112+
(b) You must cause any modified files to carry prominent notices
113+
stating that You changed the files; and
114+
115+
(c) You must retain, in the Source form of any Derivative Works
116+
that You distribute, all copyright, patent, trademark, and
117+
attribution notices from the Source form of the Work,
118+
excluding those notices that do not pertain to any part of
119+
the Derivative Works; and
120+
121+
(d) If the Work includes a "NOTICE" text file as part of its
122+
distribution, then any Derivative Works that You distribute must
123+
include a readable copy of the attribution notices contained
124+
within such NOTICE file, excluding those notices that do not
125+
pertain to any part of the Derivative Works, in at least one
126+
of the following places: within a NOTICE text file distributed
127+
as part of the Derivative Works; within the Source form or
128+
documentation, if provided along with the Derivative Works; or,
129+
within a display generated by the Derivative Works, if and
130+
wherever such third-party notices normally appear. The contents
131+
of the NOTICE file are for informational purposes only and
132+
do not modify the License. You may add Your own attribution
133+
notices within Derivative Works that You distribute, alongside
134+
or as an addendum to the NOTICE text from the Work, provided
135+
that such additional attribution notices cannot be construed
136+
as modifying the License.
137+
138+
You may add Your own copyright statement to Your modifications and
139+
may provide additional or different license terms and conditions
140+
for use, reproduction, or distribution of Your modifications, or
141+
for any such Derivative Works as a whole, provided Your use,
142+
reproduction, and distribution of the Work otherwise complies with
143+
the conditions stated in this License.
144+
145+
5. Submission of Contributions. Unless You explicitly state otherwise,
146+
any Contribution intentionally submitted for inclusion in the Work
147+
by You to the Licensor shall be under the terms and conditions of
148+
this License, without any additional terms or conditions.
149+
Notwithstanding the above, nothing herein shall supersede or modify
150+
the terms of any separate license agreement you may have executed
151+
with Licensor regarding such Contributions.
152+
153+
6. Trademarks. This License does not grant permission to use the trade
154+
names, trademarks, service marks, or product names of the Licensor,
155+
except as required for reasonable and customary use in describing the
156+
origin of the Work and reproducing the content of the NOTICE file.
157+
158+
7. Disclaimer of Warranty. Unless required by applicable law or
159+
agreed to in writing, Licensor provides the Work (and each
160+
Contributor provides its Contributions) on an "AS IS" BASIS,
161+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
162+
implied, including, without limitation, any warranties or conditions
163+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
164+
PARTICULAR PURPOSE. You are solely responsible for determining the
165+
appropriateness of using or redistributing the Work and assume any
166+
risks associated with Your exercise of permissions under this License.
167+
168+
8. Limitation of Liability. In no event and under no legal theory,
169+
whether in tort (including negligence), contract, or otherwise,
170+
unless required by applicable law (such as deliberate and grossly
171+
negligent acts) or agreed to in writing, shall any Contributor be
172+
liable to You for damages, including any direct, indirect, special,
173+
incidental, or consequential damages of any character arising as a
174+
result of this License or out of the use or inability to use the
175+
Work (including but not limited to damages for loss of goodwill,
176+
work stoppage, computer failure or malfunction, or any and all
177+
other commercial damages or losses), even if such Contributor
178+
has been advised of the possibility of such damages.
179+
180+
9. Accepting Warranty or Additional Liability. While redistributing
181+
the Work or Derivative Works thereof, You may choose to offer,
182+
and charge a fee for, acceptance of support, warranty, indemnity,
183+
or other liability obligations and/or rights consistent with this
184+
License. However, in accepting such obligations, You may act only
185+
on Your own behalf and on Your sole responsibility, not on behalf
186+
of any other Contributor, and only if You agree to indemnify,
187+
defend, and hold each Contributor harmless for any liability
188+
incurred by, or claims asserted against, such Contributor by reason
189+
of your accepting any such warranty or additional liability.
190+
191+
END OF TERMS AND CONDITIONS
192+
193+
APPENDIX: How to apply the Apache License to your work.
194+
195+
To apply the Apache License to your work, attach the following
196+
boilerplate notice, with the fields enclosed by brackets "[]"
197+
replaced with your own identifying information. (Don't include
198+
the brackets!) The text should be enclosed in the appropriate
199+
comment syntax for the file format. We also recommend that a
200+
file or class name and description of purpose be included on the
201+
same "printed page" as the copyright notice for easier
202+
identification within third-party archives.
203+
204+
Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
205+
206+
Licensed under the Apache License, Version 2.0 (the "License");
207+
you may not use this file except in compliance with the License.
208+
You may obtain a copy of the License at
209+
210+
http://www.apache.org/licenses/LICENSE-2.0
211+
212+
Unless required by applicable law or agreed to in writing, software
213+
distributed under the License is distributed on an "AS IS" BASIS,
214+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
215+
See the License for the specific language governing permissions and
216+
limitations under the License.
217+
======================================================
218+
219+
END OF JetBrains/kotlin NOTICES AND INFORMATION

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

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Xml.Linq;
99
using System.Xml.XPath;
1010
using System.Text;
11+
using Xamarin.Android.Tools.Bytecode.Kotlin;
1112

1213
namespace Xamarin.Android.Tools.Bytecode {
1314

@@ -298,6 +299,9 @@ public XElement ToXElement ()
298299
// This optional behavior is to bring compatibility with old behavior.
299300
if (AutoRename)
300301
FixUpParametersFromClasses ();
302+
303+
KotlinFixups.Fixup (classFiles);
304+
301305
var packagesDictionary = GetPackages ();
302306
var api = new XElement ("api",
303307
GetApiSource (),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using org.jetbrains.kotlin.metadata.jvm;
4+
5+
namespace Xamarin.Android.Tools.Bytecode
6+
{
7+
// https://github.com/JetBrains/kotlin/blob/master/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmNameResolver.kt
8+
class JvmNameResolver
9+
{
10+
readonly List<StringTableTypes.Record> records = new List<StringTableTypes.Record> ();
11+
readonly List<string> strings;
12+
13+
public JvmNameResolver (StringTableTypes table, List<string> strings)
14+
{
15+
foreach (var t in table.Records)
16+
for (var i = 0; i < t.Range; i++)
17+
records.Add (t);
18+
19+
this.strings = strings;
20+
}
21+
22+
public string GetString (int index)
23+
{
24+
var record = records [index];
25+
26+
string val;
27+
28+
// Get string from:
29+
// - Embedded in string record table
30+
// - Predefined string
31+
// - Constant pool
32+
if (!string.IsNullOrEmpty (record.String))
33+
val = record.String;
34+
else if (record.PredefinedIndex > 0)
35+
val = predefined_strings [record.PredefinedIndex];
36+
else
37+
val = strings [index];
38+
39+
if (record.SubstringIndexs?.Length >= 2) {
40+
var begin = record.SubstringIndexs [0];
41+
var end = record.SubstringIndexs [1];
42+
43+
if (begin > 0 && begin <= end && end <= val.Length)
44+
val = val.Substring (begin, end);
45+
}
46+
47+
if (record.ReplaceChars?.Length >= 2) {
48+
var from = (char) record.ReplaceChars [0];
49+
var to = (char) record.ReplaceChars [1];
50+
51+
val = val.Replace (from, to);
52+
}
53+
54+
if (record.operation == StringTableTypes.Record.Operation.InternalToClassId)
55+
val = val.Replace ('$', '.');
56+
else if (record.operation == StringTableTypes.Record.Operation.DescToClassId) {
57+
if (val.Length >= 2)
58+
val = val.Substring (1, val.Length - 1);
59+
60+
val = val.Replace ('$', '.');
61+
}
62+
63+
return val;
64+
}
65+
66+
static readonly string [] predefined_strings = new string [] {
67+
"kotlin/Any",
68+
"kotlin/Nothing",
69+
"kotlin/Unit",
70+
"kotlin/Throwable",
71+
"kotlin/Number",
72+
73+
"kotlin/Byte", "kotlin/Double", "kotlin/Float", "kotlin/Int",
74+
"kotlin/Long", "kotlin/Short", "kotlin/Boolean", "kotlin/Char",
75+
76+
"kotlin/CharSequence",
77+
"kotlin/String",
78+
"kotlin/Comparable",
79+
"kotlin/Enum",
80+
81+
"kotlin/Array",
82+
"kotlin/ByteArray", "kotlin/DoubleArray", "kotlin/FloatArray", "kotlin/IntArray",
83+
"kotlin/LongArray", "kotlin/ShortArray", "kotlin/BooleanArray", "kotlin/CharArray",
84+
85+
"kotlin/Cloneable",
86+
"kotlin/Annotation",
87+
88+
"kotlin/collections/Iterable", "kotlin/collections/MutableIterable",
89+
"kotlin/collections/Collection", "kotlin/collections/MutableCollection",
90+
"kotlin/collections/List", "kotlin/collections/MutableList",
91+
"kotlin/collections/Set", "kotlin/collections/MutableSet",
92+
"kotlin/collections/Map", "kotlin/collections/MutableMap",
93+
"kotlin/collections/Map.Entry", "kotlin/collections/MutableMap.MutableEntry",
94+
95+
"kotlin/collections/Iterator", "kotlin/collections/MutableIterator",
96+
"kotlin/collections/ListIterator", "kotlin/collections/MutableListIterator"
97+
};
98+
}
99+
}

0 commit comments

Comments
 (0)