Add force inline option for MSVC compiler

anthonylouisbsb · anthonylouisbsb · commit 8e05abed2f19 · 2021-07-14T20:32:22.000-03:00
diff --git a/cpp/src/gandiva/gdv_function_stubs.cc b/cpp/src/gandiva/gdv_function_stubs.cc
@@ -426,8 +426,8 @@ CAST_VARLEN_TYPE_FROM_NUMERIC(VARBINARY)
 #undef GDV_FN_CAST_VARCHAR_INTEGER
 #undef GDV_FN_CAST_VARCHAR_REAL
 
-FORCE_INLINE
-inline int32_t gdv_fn_utf8_char_length(char c) {
+GDV_FORCE_INLINE
+int32_t gdv_fn_utf8_char_length(char c) {
   if ((signed char)c >= 0) {  // 1-byte char (0x00 ~ 0x7F)
     return 1;
   } else if ((c & 0xE0) == 0xC0) {  // 2-byte char
@@ -441,8 +441,8 @@ inline int32_t gdv_fn_utf8_char_length(char c) {
   return 0;
 }
 
-FORCE_INLINE
-inline void gdv_fn_set_error_for_invalid_utf8(int64_t execution_context, char val) {
+GDV_FORCE_INLINE
+void gdv_fn_set_error_for_invalid_utf8(int64_t execution_context, char val) {
   char const* fmt = "unexpected byte \\%02hhx encountered while decoding utf8 string";
   int size = static_cast<int>(strlen(fmt)) + 64;
   char* error = reinterpret_cast<char*>(malloc(size));
@@ -602,8 +602,8 @@ const char* gdv_fn_lower_utf8(int64_t context, const char* data, int32_t data_le
 // The Unicode characters also are divided between categories. This link
 // https://www.compart.com/en/unicode/category shows
 // more information about characters categories.
-FORCE_INLINE
-inline bool gdv_fn_is_codepoint_for_space(uint32_t val) {
+GDV_FORCE_INLINE
+bool gdv_fn_is_codepoint_for_space(uint32_t val) {
   auto category = utf8proc_category(val);
 
   return category != utf8proc_category_t::UTF8PROC_CATEGORY_LU &&
diff --git a/cpp/src/gandiva/gdv_function_stubs.h b/cpp/src/gandiva/gdv_function_stubs.h
@@ -43,6 +43,17 @@ using gdv_utf8 = char*;
 using gdv_binary = char*;
 using gdv_day_time_interval = int64_t;
 
+#ifdef GANDIVA_UNIT_TEST
+// unit tests may be compiled without O2, so inlining may not happen.
+#define GDV_FORCE_INLINE
+#else
+#ifdef _MSC_VER
+#define GDV_FORCE_INLINE __forceinline
+#else
+#define GDV_FORCE_INLINE inline __attribute__((always_inline))
+#endif
+#endif
+
 bool gdv_fn_like_utf8_utf8(int64_t ptr, const char* data, int data_len,
                            const char* pattern, int pattern_len);
 
