Merge branch 'master' into rfm-patch-1

Author: rfm

CMakeLists.txt

@@ -99,7 +99,8 @@ set(libobjc_HDRS
 	objc/objc.h
 	objc/runtime-deprecated.h
 	objc/runtime.h
-	objc/slot.h)
+	objc/slot.h
+	${PROJECT_BINARY_DIR}/objc/objc-config.h)
 
 set(libobjc_CXX_SRCS
 	selector_table.cc
@@ -150,6 +151,9 @@ add_compile_definitions($<$<BOOL:${ENABLE_TRACING}>:WITH_TRACING=1>)
 add_compile_definitions($<$<BOOL:${DEBUG_ARC_COMPAT}>:DEBUG_ARC_COMPAT>)
 add_compile_definitions($<$<BOOL:${STRICT_APPLE_COMPATIBILITY}>:STRICT_APPLE_COMPATIBILITY>)
 
+configure_file(objc/objc-config.h.in objc/objc-config.h @ONLY)
+include_directories("${PROJECT_BINARY_DIR}/objc/")
+
 if (OLDABI_COMPAT)
 	list(APPEND libobjc_C_SRCS legacy.c abi_version.c statics_loader.c)
 	add_definitions(-DOLDABI_COMPAT=1)

Test/CMakeLists.txt

@@ -98,14 +98,14 @@ remove_definitions(-D__OBJC_RUNTIME_INTERNAL__=1)
 
 add_library(test_runtime_legacy OBJECT Test.m)
 set_target_properties(test_runtime_legacy PROPERTIES
-	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
+	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR};${PROJECT_BINARY_DIR}/objc/"
 	COMPILE_FLAGS "-Xclang -fblocks -fobjc-runtime=gnustep-1.7"
 	LINKER_LANGUAGE C
 )
 
 add_library(test_runtime OBJECT Test.m)
 set_target_properties(test_runtime PROPERTIES
-	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
+	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR};${PROJECT_BINARY_DIR}/objc/"
 	COMPILE_FLAGS "-Xclang -fblocks -fobjc-runtime=gnustep-2.0"
 	LINKER_LANGUAGE C
 )
@@ -123,7 +123,7 @@ function(addtest_flags TEST_NAME FLAGS TEST_SOURCE)
 	add_test(${TEST_NAME} ${TEST_NAME})
 	set(ARC "")
 	set_target_properties(${TEST_NAME} PROPERTIES
-		INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
+		INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR};${PROJECT_BINARY_DIR}/objc/"
 		COMPILE_FLAGS "-Xclang -fblocks -Xclang -fobjc-exceptions ${FLAGS}"
 		LINK_FLAGS ${INCREMENTAL}
 		LINKER_LANGUAGE C

Test/FastPathAlloc.m

@@ -21,6 +21,8 @@ @interface NoAlloc : Test @end
 @interface NoInit : Test @end
 @interface NoInit2 : NoInit @end
 
+@interface ShouldInitSubclassed : NoInit @end
+
 @implementation ShouldAlloc
 + (instancetype)alloc
 {
@@ -91,6 +93,13 @@ + (instancetype)alloc
 }
 @end
 
+@implementation ShouldInitSubclassed
++ (instancetype) alloc
+{
+	return [ShouldInit alloc];
+}
+@end
+
 Class getClassNamed(char *name)
 {
 	return nil;
@@ -114,6 +123,10 @@ int main(void)
 	[[ShouldInit2 alloc] init];
 	assert(called);
 
+	called = NO;
+	[[ShouldInitSubclassed alloc] init];
+	assert(called);
+
 	called = NO;
 	[NoAlloc alloc];
 	assert(!called);

fast_paths.m

@@ -9,9 +9,6 @@ - (id)init;
 @end
 #include <stdio.h>
 
-/**
- * Equivalent to [cls alloc].  If there's a fast path opt-in, then this skips the message send.
- */
 OBJC_PUBLIC
 id
 objc_alloc(Class cls)
@@ -66,6 +63,9 @@ - (id)init;
 		return nil;
 	}
 	id instance = objc_alloc(cls);
+	// If +alloc was overwritten, it is not guaranteed that it returns
+	// an instance of cls.
+	cls = classForObject(instance);
 	if (objc_test_class_flag(cls, objc_class_flag_fast_alloc_init))
 	{
 		return instance;

objc/objc-config.h.in

@@ -0,0 +1 @@
+#cmakedefine STRICT_APPLE_COMPATIBILITY @STRICT_APPLE_COMPATIBILITY@

objc/runtime.h

@@ -2,6 +2,7 @@
 #pragma clang system_header
 #endif
 #include "objc-visibility.h"
+#include "objc-config.h"
 
 #ifndef __LIBOBJC_RUNTIME_H_INCLUDED__
 #define __LIBOBJC_RUNTIME_H_INCLUDED__