aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-23 11:26:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-23 11:26:59 +0000
commitea1cff3b257f03a8f7d3534ee3d9bc6e2449897e (patch)
tree59cd98478ec5b6d348d4579685e9845f3835c7a3
parent3de227bdcbcabc9040d0a7a7a0d6a24393e50753 (diff)
downloadruby-ea1cff3b257f03a8f7d3534ee3d9bc6e2449897e.tar.gz
vm_insnhelper.c: missing static to inline
* vm_insnhelper.c (vm_getivar): add missing static to inline, otherwise external symbol is referred and link fails when optimization is disabled. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--vm_insnhelper.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 55d7102d1d..388b6d1c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@ Sat Apr 23 18:01:21 2016 NARUSE, Yui <naruse@ruby-lang.org>
vm1_ivar* 1.189
vm1_ivar_set* 1.024
- Note tha `inline`'s meaning is different between old GCC
+ Note the `inline`'s meaning is different between old GCC
and C99. Old GCC's inline means C99's extern inline.
https://gcc.gnu.org/onlinedocs/gcc/Inline.html
Since Ruby specify -std=iso9899:1999, it works like C99.
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 7015d0417c..0f27c9ee23 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -774,7 +774,7 @@ vm_search_const_defined_class(const VALUE cbase, ID id)
#define USE_IC_FOR_IVAR 1
#endif
-inline VALUE
+static inline VALUE
vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr)
{
#if USE_IC_FOR_IVAR