diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.ARM32.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.ARM32.txt deleted file mode 100644 index d7bfe499469..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.ARM32.txt +++ /dev/null @@ -1,21 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __ap; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __ap: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - @CStruct.VarType(align = 4, size = 4.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - val A_va_list: __builtin_va_list /* = __va_list */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - typealias __builtin_va_list = __va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.COpaquePointer.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.COpaquePointer.txt deleted file mode 100644 index 18821b3307d..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterA/contents.gold.COpaquePointer.txt +++ /dev/null @@ -1,12 +0,0 @@ - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - var A_va_list: __builtin_va_list? /* = CPointer? */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - @CCall(id = "knifunptr_pod13_A_va_list_setter") set - typealias __builtin_va_list = COpaquePointer - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer */> -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.ARM32.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.ARM32.txt deleted file mode 100644 index 7c626ed85c3..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.ARM32.txt +++ /dev/null @@ -1,19 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __ap; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __ap: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - @CStruct.VarType(align = 4, size = 4.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = __va_list - typealias __gnuc_va_list = __builtin_va_list - typealias va_list = __builtin_va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.COpaquePointer.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.COpaquePointer.txt deleted file mode 100644 index 1cfffe871d4..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/filterStdargH/contents.gold.COpaquePointer.txt +++ /dev/null @@ -1,11 +0,0 @@ - -package pod1 { - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = COpaquePointer - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer */> - typealias __gnuc_va_list = __builtin_va_list - typealias __gnuc_va_listVar = CPointerVarOf<__gnuc_va_list /* = CPointer */> - typealias va_list = __builtin_va_list - typealias va_listVar = CPointerVarOf */> -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.ARM32.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.ARM32.txt deleted file mode 100644 index 5821a87d434..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.ARM32.txt +++ /dev/null @@ -1,24 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __ap; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __ap: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - @CStruct.VarType(align = 4, size = 4.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - val A_va_list: __builtin_va_list /* = __va_list */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = __va_list - typealias __gnuc_va_list = __builtin_va_list - typealias va_list = __builtin_va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.COpaquePointer.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.COpaquePointer.txt deleted file mode 100644 index 284cc65815e..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullA/contents.gold.COpaquePointer.txt +++ /dev/null @@ -1,17 +0,0 @@ - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - var A_va_list: __builtin_va_list? /* = CPointer? */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - @CCall(id = "knifunptr_pod13_A_va_list_setter") set - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = COpaquePointer - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer */> - typealias __gnuc_va_list = __builtin_va_list - typealias __gnuc_va_listVar = CPointerVarOf<__gnuc_va_list /* = CPointer */> - typealias va_list = __builtin_va_list - typealias va_listVar = CPointerVarOf */> -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.ARM32.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.ARM32.txt deleted file mode 100644 index 7c626ed85c3..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.ARM32.txt +++ /dev/null @@ -1,19 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __ap; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __ap: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - @CStruct.VarType(align = 4, size = 4.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = __va_list - typealias __gnuc_va_list = __builtin_va_list - typealias va_list = __builtin_va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.COpaquePointer.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.COpaquePointer.txt deleted file mode 100644 index 1cfffe871d4..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/fullStdargH/contents.gold.COpaquePointer.txt +++ /dev/null @@ -1,11 +0,0 @@ - -package pod1 { - const val __GNUC_VA_LIST: Int = 1 - typealias __builtin_va_list = COpaquePointer - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer */> - typealias __gnuc_va_list = __builtin_va_list - typealias __gnuc_va_listVar = CPointerVarOf<__gnuc_va_list /* = CPointer */> - typealias va_list = __builtin_va_list - typealias va_listVar = CPointerVarOf */> -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM32.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM32.txt deleted file mode 100644 index d7bfe499469..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM32.txt +++ /dev/null @@ -1,21 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __ap; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __ap: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - @CStruct.VarType(align = 4, size = 4.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - val A_va_list: __builtin_va_list /* = __va_list */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - typealias __builtin_va_list = __va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM64.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM64.txt deleted file mode 100644 index 568bc7d2441..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.ARM64.txt +++ /dev/null @@ -1,33 +0,0 @@ - -package pod1 { - - @CStruct(spelling = "struct { void* __stack; void* __gr_top; void* __vr_top; int __gr_offs; int __vr_offs; }") class __va_list constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var __gr_offs: Int - @CStruct.MemberAt(offset = 24.toLong()) get - @CStruct.MemberAt(offset = 24.toLong()) set - var __gr_top: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 8.toLong()) get - @CStruct.MemberAt(offset = 8.toLong()) set - var __stack: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - var __vr_offs: Int - @CStruct.MemberAt(offset = 28.toLong()) get - @CStruct.MemberAt(offset = 28.toLong()) set - var __vr_top: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 16.toLong()) get - @CStruct.MemberAt(offset = 16.toLong()) set - @CStruct.VarType(align = 8, size = 32.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type - } - -} - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - val A_va_list: __builtin_va_list /* = __va_list */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - typealias __builtin_va_list = __va_list -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.COpaquePointer.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.COpaquePointer.txt deleted file mode 100644 index 18821b3307d..00000000000 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.COpaquePointer.txt +++ /dev/null @@ -1,12 +0,0 @@ - -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - var A_va_list: __builtin_va_list? /* = CPointer? */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - @CCall(id = "knifunptr_pod13_A_va_list_setter") set - typealias __builtin_va_list = COpaquePointer - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer */> -} - diff --git a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.X64.txt b/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.X64.txt index ae27c9c0146..db13f1da40d 100644 --- a/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.X64.txt +++ b/native/native.tests/testData/CInterop/builtins/builtinsDefs/modulesA/contents.gold.X64.txt @@ -1,31 +1,68 @@ +library { + // module name: -package pod1 { + library fragment { + // package name: pod1 - @CStruct(spelling = "struct { unsigned int gp_offset; unsigned int fp_offset; void* overflow_arg_area; void* reg_save_area; }") class __va_list_tag constructor(rawPtr: NativePtr /* = NativePtr */) : CStructVar { - var fp_offset: UInt - @CStruct.MemberAt(offset = 4.toLong()) get - @CStruct.MemberAt(offset = 4.toLong()) set - var gp_offset: UInt - @CStruct.MemberAt(offset = 0.toLong()) get - @CStruct.MemberAt(offset = 0.toLong()) set - var overflow_arg_area: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 8.toLong()) get - @CStruct.MemberAt(offset = 8.toLong()) set - var reg_save_area: COpaquePointer? /* = CPointer? */ - @CStruct.MemberAt(offset = 16.toLong()) get - @CStruct.MemberAt(offset = 16.toLong()) set - @CStruct.VarType(align = 8, size = 24.toLong()) @Deprecated(level = DeprecationLevel.WARNING, message = "Use sizeOf() or alignOf() instead.", replaceWith = ReplaceWith(expression = "", imports = {})) companion object : CStructVar.Type + // class name: pod1/__va_list_tag + // class name: pod1/__va_list_tag.Companion + + @kotlinx/cinterop/internal/CStruct(spelling = "struct { unsigned int gp_offset; unsigned int fp_offset; void* overflow_arg_area; void* reg_save_area; }") + public final class pod1/__va_list_tag : kotlinx/cinterop/CStructVar { + + public constructor(rawPtr: kotlin/native/internal/NativePtr /* = kotlinx/cinterop/NativePtr^ */) + + public final var fp_offset: kotlin/UInt + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 4L) + public final /* non-default */ external get + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 4L) + public final /* non-default */ external set(value: kotlin/UInt) + + public final var gp_offset: kotlin/UInt + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 0L) + public final /* non-default */ external get + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 0L) + public final /* non-default */ external set(value: kotlin/UInt) + + public final var overflow_arg_area: kotlinx/cinterop/CPointer? /* = kotlinx/cinterop/COpaquePointer^? */ + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 8L) + public final /* non-default */ external get + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 8L) + public final /* non-default */ external set(value: kotlinx/cinterop/CPointer? /* = kotlinx/cinterop/COpaquePointer^? */) + + public final var reg_save_area: kotlinx/cinterop/CPointer? /* = kotlinx/cinterop/COpaquePointer^? */ + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 16L) + public final /* non-default */ external get + @kotlinx/cinterop/internal/CStruct.MemberAt(offset = 16L) + public final /* non-default */ external set(value: kotlinx/cinterop/CPointer? /* = kotlinx/cinterop/COpaquePointer^? */) + + // companion object: Companion + + // nested class: Companion } -} + @kotlinx/cinterop/internal/CStruct.VarType(size = 24L, align = 8) + @kotlin/Deprecated(message = "Use sizeOf() or alignOf() instead.", replaceWith = kotlin/ReplaceWith(imports = [], expression = ""), level = kotlin/DeprecationLevel.WARNING) + public final companion object pod1/__va_list_tag.Companion : kotlinx/cinterop/CStructVar.Type { -package pod1 { - var A: Int - @CCall(id = "knifunptr_pod10_A_getter") get - @CCall(id = "knifunptr_pod11_A_setter") set - val A_va_list: __builtin_va_list /* = CPointer<__va_list_tag> */ - @CCall(id = "knifunptr_pod12_A_va_list_getter") get - typealias __builtin_va_list = CArrayPointer<__va_list_tag> - typealias __builtin_va_listVar = CPointerVarOf<__builtin_va_list /* = CPointer<__va_list_tag> */> -} + private constructor() + } + package { + + public final var A: kotlin/Int + @kotlinx/cinterop/internal/CCall(id = "knifunptr_pod10_A_getter") + public final /* non-default */ external get + @kotlinx/cinterop/internal/CCall(id = "knifunptr_pod11_A_setter") + public final /* non-default */ external set(value: kotlin/Int) + + public final val A_va_list: kotlinx/cinterop/CPointer /* = pod1/__builtin_va_list^ */ + @kotlinx/cinterop/internal/CCall(id = "knifunptr_pod12_A_va_list_getter") + public final /* non-default */ external get + + public typealias __builtin_va_list = kotlinx/cinterop/CArrayPointer^ /* = kotlinx/cinterop/CPointer /* = kotlinx/cinterop/CArrayPointer^ */ */ + + public typealias __builtin_va_listVar = kotlinx/cinterop/CPointerVarOf /* = kotlinx/cinterop/CPointerVarOf /* = pod1/__builtin_va_list^ */> */ + } + } +}