summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-09 07:52:23 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-09 07:52:23 +0000
commitcb18d4ba462e50149d2d9a5066ecdbac44d32905 (patch)
treee75979109c0d2667f99d0150e81eff8b3a4be30c /vm_insnhelper.c
parent9a9569b1c28cdedd27f3b49b9b8d2497c2585593 (diff)
* vm_insnhelper.c (vm_getivar): use always_inline because
gcc7 doesn't inline this without always_inline. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 9c230e018a..7ee39c736b 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -15,16 +15,10 @@
#include "internal.h"
#include "probes.h"
#include "probes_helper.h"
+#include "ruby/config.h"
/* control stack frame */
-#undef INLINE
-#if defined __GNUC__ && !defined __NO_INLINE__ && !defined __clang__
-#define INLINE inline
-#else
-#define INLINE static inline
-#endif
-
static rb_control_frame_t *vm_get_ruby_level_caller_cfp(const rb_thread_t *th, const rb_control_frame_t *cfp);
VALUE
@@ -867,7 +861,7 @@ vm_search_const_defined_class(const VALUE cbase, ID id)
#define USE_IC_FOR_IVAR 1
#endif
-INLINE VALUE
+ALWAYS_INLINE() inline VALUE
vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr)
{
#if USE_IC_FOR_IVAR