summaryrefslogtreecommitdiff
path: root/compile.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-21 20:47:53 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-21 20:47:53 +0000
commit7cf523c7db67c22ffc09b38a9c5bea057f578db2 (patch)
tree93119a59a19abdd3a1d931fc27c5828b234418e8 /compile.c
parent42c3a67748da667cb87afd7928718c537cdd8201 (diff)
* vm_opts.h, iseq.c, iseq.h: add compile option to force frozen
string literals. [Feature #11473] This addition is not specification change, but to try frozen string literal world discussed on [Feature #11473]. You can try frozen string literal world using this magical line: RubyVM::InstructionSequence.compile_option = {frozen_string_literal: true} Note that this is a global compilation option, so that you need to compile another script like that: p 'foo'.frozen? #=> false RubyVM::InstructionSequence.compile_option = {frozen_string_literal: true} p 'foo'.frozen? #=> false, because this line is already compiled. p eval("'foo'.frozen?") #=> true Details: * String literals are deduped by rb_fstring(). * Dynamic string literals ("...#{xyz}...") is now only frozen, not deduped. Maybe you have other ideas. Now, please do not use this option on your productions :) Of course, current specification can be changed. * compile.c: ditto. * test/ruby/test_iseq.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
-rw-r--r--compile.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/compile.c b/compile.c
index 26ee3b2..07cd7a6 100644
--- a/compile.c
+++ b/compile.c
@@ -5002,10 +5002,15 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
break;
}
case NODE_STR:{
- node->nd_lit = rb_fstring(node->nd_lit);
debugp_param("nd_lit", node->nd_lit);
if (!poped) {
- ADD_INSN1(ret, line, putstring, node->nd_lit);
+ node->nd_lit = rb_fstring(node->nd_lit);
+ if (iseq->compile_data->option->frozen_string_literal) {
+ ADD_INSN1(ret, line, putobject, node->nd_lit); /* already frozen */
+ }
+ else {
+ ADD_INSN1(ret, line, putstring, node->nd_lit);
+ }
}
break;
}
@@ -5015,6 +5020,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if (poped) {
ADD_INSN(ret, line, pop);
}
+ else {
+ if (iseq->compile_data->option->frozen_string_literal) {
+ ADD_SEND (ret, line, idFreeze, INT2FIX(0));
+ }
+ }
break;
}
case NODE_XSTR:{