Replacing some VM macros with static inline functions.

# Conflicts: # iree/vm/value.h
iree-org · Aug 17, 2020 · b7c1c12 · b7c1c12
1 parent 033adac
commit b7c1c12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/iree/vm/bytecode_module_impl.h b/iree/vm/bytecode_module_impl.h
@@ -18,14 +18,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#ifdef IREE_PLATFORM_ANDROID
+// VC++ does not have C11's stdalign.h.
+#if !defined(_MSC_VER)
 #include <stdalign.h>
-#else
-// TODO(benvanik): figure out how to make MSVC happy with C11 stdalign.h.
-#ifdef __cplusplus
-#include <cstdalign>
-#endif  // __cplusplus
-#endif
+#endif  // _MSC_VER
 
 #include "iree/base/api.h"
 #include "iree/vm/builtin_types.h"

diff --git a/iree/vm/type_def.h b/iree/vm/type_def.h
@@ -36,35 +36,28 @@ typedef struct {
   iree_vm_ref_type_t ref_type : 24;
 } iree_vm_type_def_t;
 
-#ifdef __cplusplus
-inline iree_vm_type_def_t iree_vm_type_def_make_variant_type() {
+static inline iree_vm_type_def_t iree_vm_type_def_make_variant_type() {
   iree_vm_type_def_t result;
   result.value_type = IREE_VM_VALUE_TYPE_NONE;
   result.ref_type = IREE_VM_REF_TYPE_NULL;
   return result;
 }
-inline iree_vm_type_def_t iree_vm_type_def_make_value_type(
+
+static inline iree_vm_type_def_t iree_vm_type_def_make_value_type(
     iree_vm_value_type_t value_type) {
   iree_vm_type_def_t result;
   result.value_type = value_type;
   result.ref_type = IREE_VM_REF_TYPE_NULL;
   return result;
 }
-inline iree_vm_type_def_t iree_vm_type_def_make_ref_type(
+
+static inline iree_vm_type_def_t iree_vm_type_def_make_ref_type(
     iree_vm_ref_type_t ref_type) {
   iree_vm_type_def_t result;
   result.value_type = IREE_VM_VALUE_TYPE_NONE;
   result.ref_type = ref_type;
   return result;
 }
-#else
-#define iree_vm_type_def_make_variant_type() \
-  { .value_type = IREE_VM_VALUE_TYPE_NONE, .ref_type = IREE_VM_REF_TYPE_NULL, }
-#define iree_vm_type_def_make_value_type(value_type) \
-  { .value_type = (value_type), .ref_type = IREE_VM_REF_TYPE_NULL, }
-#define iree_vm_type_def_make_ref_type(ref_type) \
-  { .value_type = IREE_VM_VALUE_TYPE_NONE, .ref_type = (ref_type), }
-#endif  // __cplusplus
 
 #define iree_vm_type_def_is_value(v) \
   ((v)->value_type != IREE_VM_VALUE_TYPE_NONE)