azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -produce framework broken by 9d14a29f

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-12-15 17:35:31 +03:00
committed by SvyatoslavScherbina
parent 9d14a29f49
commit d7d0bcb92b
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
+5 -1
View File
@@ -306,8 +306,12 @@ private fun ObjCExportCodeGenerator.setObjCExportTypeInfo(
objCClass: ConstPointer? = null, objCClass: ConstPointer? = null,
typeAdapter: ConstPointer? = null typeAdapter: ConstPointer? = null
) { ) {
if (converter != null) {
assert(converter.llvmType == pointerType(functionType(int8TypePtr, false, codegen.kObjHeaderPtr)))
}
val objCExportAddition = Struct(runtime.typeInfoObjCExportAddition, val objCExportAddition = Struct(runtime.typeInfoObjCExportAddition,
converter, converter?.bitcast(int8TypePtr),
objCClass, objCClass,
typeAdapter typeAdapter
) )
runtime/src/main/cpp/ObjCExport.mm
+15 -9
View File
@@ -72,7 +72,7 @@ struct ObjCTypeAdapter {
typedef id (*convertReferenceToObjC)(ObjHeader* obj); typedef id (*convertReferenceToObjC)(ObjHeader* obj);
struct TypeInfoObjCExportAddition { struct TypeInfoObjCExportAddition {
convertReferenceToObjC convert; /*convertReferenceToObjC*/ void* convert;
Class objCClass; Class objCClass;
const ObjCTypeAdapter* typeAdapter; const ObjCTypeAdapter* typeAdapter;
}; };
@@ -100,10 +100,14 @@ inline static void SetAssociatedObject(ObjHeader* obj, id value) {
*reinterpret_cast<id*>(GetReservedObjectTail(obj)) = value; *reinterpret_cast<id*>(GetReservedObjectTail(obj)) = value;
} }
extern "C" inline id Kotlin_ObjCExport_GetAssociatedObject(ObjHeader* obj) { static inline id GetAssociatedObject(ObjHeader* obj) {
return *reinterpret_cast<id*>(GetReservedObjectTail(obj)); return *reinterpret_cast<id*>(GetReservedObjectTail(obj));
} }
extern "C" id Kotlin_ObjCExport_GetAssociatedObject(ObjHeader* obj) {
return GetAssociatedObject(obj);
}
inline static OBJ_GETTER(AllocInstanceWithAssociatedObject, const TypeInfo* typeInfo, id associatedObject) { inline static OBJ_GETTER(AllocInstanceWithAssociatedObject, const TypeInfo* typeInfo, id associatedObject) {
ObjHeader* result = AllocInstance(typeInfo, OBJ_RESULT); ObjHeader* result = AllocInstance(typeInfo, OBJ_RESULT);
RuntimeAssert(HasAssociatedObjectField(result), ""); RuntimeAssert(HasAssociatedObjectField(result), "");
@@ -199,7 +203,7 @@ static void initializeClass(Class clazz);
extern "C" void Kotlin_ObjCExport_releaseReservedObjectTail(ObjHeader* obj) { extern "C" void Kotlin_ObjCExport_releaseReservedObjectTail(ObjHeader* obj) {
RuntimeAssert(HasAssociatedObjectField(obj), ""); RuntimeAssert(HasAssociatedObjectField(obj), "");
id associatedObject = Kotlin_ObjCExport_GetAssociatedObject(obj); id associatedObject = GetAssociatedObject(obj);
if (associatedObject != nullptr) { if (associatedObject != nullptr) {
[associatedObject releaseAsAssociatedObject]; [associatedObject releaseAsAssociatedObject];
} }
@@ -483,6 +487,8 @@ struct Block_literal_1 {
// imported variables // imported variables
}; };
struct Block_literal_1 exportBlockLiteral;
struct Block_descriptor_1 { struct Block_descriptor_1 {
unsigned long int reserved; // NULL unsigned long int reserved; // NULL
unsigned long int size; // sizeof(struct Block_literal_1) unsigned long int size; // sizeof(struct Block_literal_1)
@@ -571,13 +577,13 @@ extern "C" id Kotlin_ObjCExport_refToObjC(ObjHeader* obj) {
if (obj == nullptr) return nullptr; if (obj == nullptr) return nullptr;
if (HasAssociatedObjectField(obj)) { if (HasAssociatedObjectField(obj)) {
id associatedObject = Kotlin_ObjCExport_GetAssociatedObject(obj); id associatedObject = GetAssociatedObject(obj);
if (associatedObject != nullptr) { if (associatedObject != nullptr) {
return objc_retainAutoreleaseReturnValue(associatedObject); return objc_retainAutoreleaseReturnValue(associatedObject);
} }
} }
convertReferenceToObjC converter = obj->type_info()->writableInfo_->objCExport.convert; convertReferenceToObjC converter = (convertReferenceToObjC)obj->type_info()->writableInfo_->objCExport.convert;
if (converter != nullptr) { if (converter != nullptr) {
return converter(obj); return converter(obj);
} }
@@ -602,7 +608,7 @@ static id Kotlin_ObjCExport_refToObjC_slowpath(ObjHeader* obj) {
convertReferenceToObjC converter = nullptr; convertReferenceToObjC converter = nullptr;
for (int i = 0; i < typeInfo->implementedInterfacesCount_; ++i) { for (int i = 0; i < typeInfo->implementedInterfacesCount_; ++i) {
converter = typeInfo->implementedInterfaces_[i]->writableInfo_->objCExport.convert; converter = (convertReferenceToObjC)typeInfo->implementedInterfaces_[i]->writableInfo_->objCExport.convert;
if (converter != nullptr) break; if (converter != nullptr) break;
} }
@@ -611,18 +617,18 @@ static id Kotlin_ObjCExport_refToObjC_slowpath(ObjHeader* obj) {
converter = (typeInfo == theUnitTypeInfo) ? &Kotlin_ObjCExport_convertUnit : &convertKotlinObject; converter = (typeInfo == theUnitTypeInfo) ? &Kotlin_ObjCExport_convertUnit : &convertKotlinObject;
} }
typeInfo->writableInfo_->objCExport.convert = converter; typeInfo->writableInfo_->objCExport.convert = (void*)converter;
return converter(obj); return converter(obj);
} }
extern "C" KInt Kotlin_NSArrayList_getSize(ObjHeader* obj) { extern "C" KInt Kotlin_NSArrayList_getSize(ObjHeader* obj) {
NSArray* array = (NSArray*) Kotlin_ObjCExport_GetAssociatedObject(obj); NSArray* array = (NSArray*) GetAssociatedObject(obj);
return [array count]; return [array count];
} }
extern "C" OBJ_GETTER(Kotlin_NSArrayList_getElement, ObjHeader* obj, KInt index) { extern "C" OBJ_GETTER(Kotlin_NSArrayList_getElement, ObjHeader* obj, KInt index) {
NSArray* array = (NSArray*) Kotlin_ObjCExport_GetAssociatedObject(obj); NSArray* array = (NSArray*) GetAssociatedObject(obj);
id element = [array objectAtIndex:index]; id element = [array objectAtIndex:index];
if (element == NSNull.null) RETURN_OBJ(nullptr); if (element == NSNull.null) RETURN_OBJ(nullptr);
RETURN_RESULT_OF(Kotlin_ObjCExport_refFromObjC, element); RETURN_RESULT_OF(Kotlin_ObjCExport_refFromObjC, element);