1From 73efe0ea75c3ac4cb088f300acc3de44d5dd3344 Mon Sep 17 00:00:00 2001 2From: Kai Kang <kai.kang@windriver.com> 3Date: Fri, 11 Aug 2023 14:20:48 +0800 4Subject: [PATCH] [CMake] Add a variable to control macro 5 __PAS_ALWAYS_INLINE_BUT_NOT_INLINE 6 https://bugs.webkit.org/show_bug.cgi?id=260065 7 8Reviewed by NOBODY (OOPS!). 9 10It fails to compile webkitgtk with option `-Og` of gcc/g++: 11 12| In file included from Source/bmalloc/libpas/src/libpas/pas_heap_page_provider.h:30, 13| from Source/bmalloc/libpas/src/libpas/pas_bootstrap_heap_page_provider.h:29, 14| from Source/bmalloc/libpas/src/libpas/pas_large_heap_physical_page_sharing_cache.h:29, 15| from Source/bmalloc/libpas/src/libpas/pas_basic_heap_page_caches.h:29, 16| from Source/bmalloc/libpas/src/libpas/pas_heap_config_utils.h:32, 17| from Source/bmalloc/libpas/src/libpas/bmalloc_heap_config.h:34, 18| from Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:34, 19| from Source/bmalloc/bmalloc/bmalloc.h:39, 20| from Source/bmalloc/bmalloc/bmalloc.cpp:26: 21| In function 'pas_allocation_result pas_local_allocator_try_allocate(pas_local_allocator*, size_t, size_t, pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter)', 22| inlined from 'pas_allocation_result pas_try_allocate_common_impl_fast(pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter, pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_common.h:85:46, 23| inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_impl_fast(pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1, 24| inlined from 'pas_allocation_result pas_try_allocate_intrinsic_impl_casual_case(__pas_heap*, size_t, size_t, pas_intrinsic_heap_support*, pas_heap_config, pas_try_allocate_common_fast, pas_try_allocate_common_slow, pas_intrinsic_heap_designation_mode)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_intrinsic.h:167:44, 25| inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_casual_case(size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1: 26| webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_allocation_result.h:76:1: error: inlining failed in call to 'always_inline' 'pas_allocation_result pas_allocation_result_identity(pas_allocation_result)': function not considered for inlining 27| 76 | pas_allocation_result_identity(pas_allocation_result result) 28| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 29 30Add an variable `WEBKIT_NO_INLINE_HINTS` to control macro 31__PAS_ALWAYS_INLINE_BUT_NOT_INLINE whether includes function attribute 32`always_inline`. It could set the variable to make compilation pass when 33gcc option `-Og` is used. 34 35* Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h: 36* Source/cmake/WebKitCompilerFlags.cmake: 37 38Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/16601] 39 40Signed-off-by: Kai Kang <kai.kang@windriver.com> 41--- 42 Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | 2 +- 43 Source/cmake/WebKitCompilerFlags.cmake | 7 +++++++ 44 2 files changed, 8 insertions(+), 1 deletion(-) 45 46diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h 47index 5d5fb38cddbd..a554f70064eb 100644 48--- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h 49+++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h 50@@ -44,7 +44,7 @@ __PAS_BEGIN_EXTERN_C; 51 #define __SUSPICIOUS__ 52 #define __BROKEN__ 53 54-#ifdef __OPTIMIZE__ 55+#if defined(__OPTIMIZE__) && !defined(WEBKIT_NO_INLINE_HINTS) 56 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE __attribute__((__always_inline__)) 57 #else 58 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE 59diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake 60index 9b2fecf9a0d3..7cdc2b6afbe0 100644 61--- a/Source/cmake/WebKitCompilerFlags.cmake 62+++ b/Source/cmake/WebKitCompilerFlags.cmake 63@@ -453,3 +453,10 @@ endif () 64 65 # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438> 66 set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON) 67+ 68+# It fails to compile with `gcc -Og` 69+set(WEBKIT_NO_INLINE_HINTS OFF CACHE BOOL "Disable funtion attribute always_inline for WebKit") 70+ 71+if (WEBKIT_NO_INLINE_HINTS) 72+ add_definitions(-DWEBKIT_NO_INLINE_HINTS) 73+endif () 74-- 752.34.1 76 77