Adapt to klib abi version no longer being a single int32

(cherry picked from commit 75b5a2f248caf8e1e9e919784fd017671023078d)
This commit is contained in:
Alexander Gorshenev
2020-03-06 21:20:50 +03:00
committed by Vasily Levchenko
parent b94a4f48e3
commit dcefc2cb31
2 changed files with 6 additions and 3 deletions
@@ -101,7 +101,10 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
extendedInfo,
Int32(KotlinAbiVersion.CURRENT.version),
// TODO: it used to be a single int32 ABI version,
// but klib abi version is not an int anymore.
// So now this field is just reserved to preserve the layout.
Int32(0),
Int32(size),
+2 -2
View File
@@ -103,8 +103,8 @@ struct TypeInfo {
const TypeInfo* typeInfo_;
// Extended RTTI, to retain cross-version debuggability, since ABI version 5 shall always be at the second position.
const ExtendedTypeInfo* extendedInfo_;
// ABI version.
uint32_t abiVersion_;
// Unused field.
uint32_t unused_;
// Negative value marks array class/string, and it is negated element size.
int32_t instanceSize_;
// Must be pointer to Any for array classes, and null for Any.