Update for Clang

Signed-off-by: Mike Essenmacher <[email protected]>

Author: Mike Essenmacher

src/Runtime/jni/jnilog.h

@@ -40,7 +40,8 @@ enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_FATAL };
      * it means the output, with a trailing '\0', fits in the buffer.          \
      */                                                                        \
     while (__i < __l &&                                                        \
-           (__k = snprintf(__p, __j, (format), ((type *)(data))[__i])) < __j) {\
+           (__k = snprintf(__p, __j, (format),                                 \
+                ((type *)(data))[__i])) < __j) {                               \
       assert(__k >= 0 && "snprintf write error to __p");                       \
       __p += __k;                                                              \
       __j -= __k;                                                              \
@@ -73,24 +74,28 @@ enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_FATAL };
       break;                                                                   \
     case ONNX_TYPE_UINT16:                                                     \
     case ONNX_TYPE_INT16:                                                      \
-      LOG_BUF_C_TYPE(const short, (hex) ? " %04x" : " %d", (buf), (data), (n));\
+      LOG_BUF_C_TYPE(                                                          \
+          const short, (hex) ? " %04x" : " %d", (buf), (data), (n));           \
       break;                                                                   \
     case ONNX_TYPE_UINT32:                                                     \
     case ONNX_TYPE_INT32:                                                      \
       LOG_BUF_C_TYPE(const int, (hex) ? " %08x" : " %d", (buf), (data), (n));  \
       break;                                                                   \
     case ONNX_TYPE_UINT64:                                                     \
     case ONNX_TYPE_INT64:                                                      \
-      LOG_BUF_C_TYPE(const long, (hex) ? " %016x" : " %ld", (buf), (data), (n));\
+      LOG_BUF_C_TYPE(                                                          \
+          const long, (hex) ? " %016x" : " %ld", (buf), (data), (n));          \
       break;                                                                   \
     case ONNX_TYPE_FLOAT16:                                                    \
       LOG_BUF_C_TYPE(const short, " %04x", (buf), (data), (n));                \
       break;                                                                   \
     case ONNX_TYPE_FLOAT:                                                      \
-      LOG_BUF_C_TYPE(const float, (hex) ? " %08x" : " %f", (buf), (data), (n));\
+      LOG_BUF_C_TYPE(                                                          \
+          const float, (hex) ? " %08x" : " %f", (buf), (data), (n));           \
       break;                                                                   \
     case ONNX_TYPE_DOUBLE:                                                     \
-      LOG_BUF_C_TYPE(const double, (hex) ? " %016x" : " %lf", (buf), (data), (n));\
+      LOG_BUF_C_TYPE(                                                          \
+          const double, (hex) ? " %016x" : " %lf", (buf), (data), (n));        \
       break;                                                                   \
     default: {                                                                 \
       int __a = sprintf((buf), " unsupported data type %d ", (type));          \
@@ -102,7 +107,7 @@ enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_FATAL };
 #define LOG_BUF(type, buf, data, n)                                            \
   LOG_BUF_ONNX_TYPE((type), (buf), (data), (n), 0)
 #define LOG_XBUF(type, buf, data, n)                                           \
-  LOG_BUF_ONNX_TYPE((type),(buf), (data), (n), 1)
+  LOG_BUF_ONNX_TYPE((type), (buf), (data), (n), 1)
 
 #define LOG_CHAR_BUF(buf, data, n)                                             \
   LOG_BUF_C_TYPE(const char, "%c", (buf), (data), (n))
@@ -127,7 +132,7 @@ enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_FATAL };
 #define LOG_DOUBLE_BUF(buf, data, n)                                           \
   LOG_BUF_C_TYPE(const double, " %lf", (buf), (data), (n))
 #define LOG_DOUBLE_XBUF(buf, data, n)                                          \
-  LOG_BUF_C_TYPE(const double, " %016x", (buf), (data),(n))
+  LOG_BUF_C_TYPE(const double, " %016x", (buf), (data), (n))
 
 /* Main macro for log output */
 #define LOG_PRINTF(level, ...)                                                 \

src/Runtime/jni/jniwrapper.c

@@ -37,7 +37,7 @@ extern OMTensorList *run_main_graph(OMTensorList *);
  * this call simply returns NULL.
  */
 #define CHECK_CALL(type, var, call, success, ...)                              \
-  type (var) = (call);                                                         \
+  type(var) = (call);                                                          \
   do {                                                                         \
     if (!(success)) {                                                          \
       LOG_PRINTF(LOG_ERROR, __VA_ARGS__);                                      \
@@ -78,7 +78,7 @@ extern OMTensorList *run_main_graph(OMTensorList *);
  * log error and throw Java exception if the call failed.
  */
 #define JNI_TYPE_VAR_CALL(env, type, var, call, success, ecpt, ...)            \
-  JNI_CALL((env), type (var) = (call), (success), (ecpt), __VA_ARGS__);
+  JNI_CALL((env), type(var) = (call), (success), (ecpt), __VA_ARGS__);
 
 /* Make a native library call, check success condition,
  * log error and throw Java exception if native code failed.
@@ -108,7 +108,7 @@ extern OMTensorList *run_main_graph(OMTensorList *);
  * if the call failed. Also check success condition.
  */
 #define LIB_TYPE_VAR_CALL(type, var, call, success, env, ecpt, ...)            \
-  LIB_CALL(type (var) = (call), (success), (env), (ecpt), __VA_ARGS__);
+  LIB_CALL(type(var) = (call), (success), (env), (ecpt), __VA_ARGS__);
 
 /* Debug output of OMTensor fields */
 #define OMT_DEBUG(                                                             \

src/Support/SmallFPConversion.c

@@ -25,7 +25,7 @@
 //
 // might violate the rules about strict aliasing in C++.
 #define BIT_CAST(TO_TYPE, TO, FROM)                                            \
-  TO_TYPE (TO);                                                                \
+  TO_TYPE(TO);                                                                \
   static_assert(sizeof(TO) == sizeof(FROM), "only bit cast same sizes");       \
   memcpy(&(TO), &(FROM), sizeof(FROM))