February 2011 - macruby-changes - lists.macosforge.org

[5228] MacRuby/trunk/ruby_deploy.1
by source_changes＠macosforge.org 10 Feb '11

10 Feb '11

Revision: 5228 http://trac.macosforge.org/projects/ruby/changeset/5228 Author: lsansonetti(a)apple.com Date: 2011-02-09 17:54:34 -0800 (Wed, 09 Feb 2011) Log Message: ----------- cover new --gem and --bs options Modified Paths: -------------- MacRuby/trunk/ruby_deploy.1 Modified: MacRuby/trunk/ruby_deploy.1 =================================================================== --- MacRuby/trunk/ruby_deploy.1 2011-02-10 01:48:35 UTC (rev 5227) +++ MacRuby/trunk/ruby_deploy.1 2011-02-10 01:54:34 UTC (rev 5228) @@ -25,6 +25,12 @@ Embed only .Ar lib from the standard library +.It Fl -gem Ar gem +Embed +.Ar gem +and its dependencies +.It Fl -bs +Embed the BridgeSupport system files .It Fl -verbose Log actions to standard out .It Fl v , Fl -version

1 0

[5227] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 10 Feb '11

10 Feb '11

Revision: 5227 http://trac.macosforge.org/projects/ruby/changeset/5227 Author: lsansonetti(a)apple.com Date: 2011-02-09 17:48:35 -0800 (Wed, 09 Feb 2011) Log Message: ----------- add --bs option to macruby_deploy which embeds the BridgeSupport system files inside the application's bundle, add some stderr logging Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-02-10 01:00:38 UTC (rev 5226) +++ MacRuby/trunk/bin/ruby_deploy 2011-02-10 01:48:35 UTC (rev 5227) @@ -22,7 +22,8 @@ opts.on('--no-stdlib', 'Do not embed the standard library') { @no_stdlib = true } opts.on('--stdlib [LIB]', 'Embed only LIB from the standard library') { |lib| @stdlib << lib } opts.on('--gem [GEM]', 'Embed GEM and its dependencies') { |gem| @gems << gem } - opts.on('--verbose', 'Log actions to standard out') { @verbose = true } + opts.on('--bs', 'Embed the system BridgeSupport files') { @embed_bs = true } + opts.on('--verbose', 'Log all commands to standard out') { @verbose = true } opts.on('-v', '--version', 'Display the version') do puts RUBY_DESCRIPTION exit 1 @@ -52,8 +53,11 @@ die "Nothing to do, please specify --compile or --embed" if !@compile and !@embed die "--no-stdlib can only be used with --embed" if @no_stdlib and !@embed die "--stdlib can only be used with --embed" if !(a)stdlib.empty? and !@embed + die "--bs can only be used with --embed" if @embed_bs and !@embed + log "Deployment started" embed if @embed compile if @compile + log "Deployment ended" end private @@ -61,7 +65,7 @@ # FileUtils::Verbose doesn't work with MacRuby yet. However, it doesn't print # out failures anyways, just the command. Use the command-line tools directly # to circumvent this. - { :cp_r => 'cp -R', :mkdir_p => 'mkdir -p', :rm_rf => 'rm -rf' }.each do |name, cmd| + { :cp => 'cp', :cp_r => 'cp -R', :mkdir_p => 'mkdir -p', :rm_rf => 'rm -rf' }.each do |name, cmd| module_eval <<-END, __FILE__, __LINE__ + 1 def #{name}(*args) execute "#{cmd} \#{args.map { |a| "'\#{a}'" }.join(' ')}" @@ -73,6 +77,14 @@ File.join(@app_bundle, 'Contents/Frameworks') end + def app_resources + File.join(@app_bundle, 'Contents/Resources') + end + + def app_bs + File.join(app_resources, 'BridgeSupport') + end + def app_macruby File.join(app_frameworks, 'MacRuby.framework') end @@ -92,6 +104,7 @@ MACRUBYC = File.join(RbConfig::CONFIG['bindir'], 'macrubyc') def compile + log "Compiling files" compile_files.each do |source| base = File.basename(source, '.rb') next if base == 'rb_main' @@ -135,6 +148,7 @@ gems_libdirs_to_embed = @gems.map { |x| gem_deps_libdirs(x) }.flatten # Copy MacRuby.framework inside MyApp.app/Contents/Frameworks. + log "Embedding MacRuby.framework" mkdir_p(app_frameworks) rm_rf(app_macruby) cp_r(@macruby_framework_path, app_frameworks) @@ -144,6 +158,7 @@ rm_rf(File.join(app_macruby, 'Versions', 'Current')) # Delete unnecessary things in the MacRuby.framework copy. + log "Trimming MacRuby.framework" dirs = ['bin', 'include', 'lib/libmacruby-static.a', 'share'] dirs << 'lib/ruby' if @no_stdlib dirs << 'lib/ruby/Gems' @@ -159,6 +174,7 @@ # Copy the gems libdirs. unless gems_libdirs_to_embed.empty? + log "Embed RubyGems libdirs: #{gems_libdirs_to_embed.join(', ')}" gems_libdirs_dest = File.join(app_macruby_usr, 'lib', 'ruby', 'site_ruby', RUBY_VERSION) mkdir_p(gems_libdirs_dest) gems_libdirs_to_embed.each do |libdir| @@ -174,12 +190,22 @@ rm_rf(x) } + # Copy the system BridgeSupport files if asked + if @embed_bs + log "Embed BridgeSupport system files" + mkdir_p(app_bs) + Dir.glob('/System/Library/Frameworks/**/BridgeSupport/*.{bridgesupport,dylib}').each do |path| + cp(path, app_bs) + end + end + # Wait with fixing install name until all binaries are available. fix_install_name end # Hack the application binaries to link against the MacRuby.framework copy. def fix_install_name + log "Fix install path of binaries" patterns = [File.join(@app_bundle, 'Contents/MacOS/*'), File.join(app_macruby_usr, 'lib/ruby/**/*.{bundle,rbo}'), File.join(@app_bundle, 'Contents/Resources/*.rbo')] @@ -212,6 +238,10 @@ $stderr.puts args exit 1 end + + def log(msg) + $stderr.puts "*** #{msg}" + end end Deployer.new(ARGV).run

1 0

[5226] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 10 Feb '11

10 Feb '11

Revision: 5226 http://trac.macosforge.org/projects/ruby/changeset/5226 Author: lsansonetti(a)apple.com Date: 2011-02-09 17:00:38 -0800 (Wed, 09 Feb 2011) Log Message: ----------- macruby_deploy with --embed now deletes the Current symlink as it seems to cause the AppStore validation process to fail Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-02-10 00:53:17 UTC (rev 5225) +++ MacRuby/trunk/bin/ruby_deploy 2011-02-10 01:00:38 UTC (rev 5226) @@ -139,6 +139,10 @@ rm_rf(app_macruby) cp_r(@macruby_framework_path, app_frameworks) + # Delete the Current framework symlink in the MacRuby.framework copy + # as it seems to cause the AppStore validation process to fail. + rm_rf(File.join(app_macruby, 'Versions', 'Current')) + # Delete unnecessary things in the MacRuby.framework copy. dirs = ['bin', 'include', 'lib/libmacruby-static.a', 'share'] dirs << 'lib/ruby' if @no_stdlib

1 0

[5225] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 10 Feb '11

10 Feb '11

Revision: 5225 http://trac.macosforge.org/projects/ruby/changeset/5225 Author: lsansonetti(a)apple.com Date: 2011-02-09 16:53:17 -0800 (Wed, 09 Feb 2011) Log Message: ----------- fix a bug in macruby_deploy with --embed where the main application's executable's link path would not be updated Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-02-09 03:21:27 UTC (rev 5224) +++ MacRuby/trunk/bin/ruby_deploy 2011-02-10 00:53:17 UTC (rev 5225) @@ -171,7 +171,7 @@ } # Wait with fixing install name until all binaries are available. - fix_install_name unless @compile + fix_install_name end # Hack the application binaries to link against the MacRuby.framework copy.

1 0

[5224] MacRuby/trunk/lib/rubygems/package/tar_writer.rb
by source_changes＠macosforge.org 09 Feb '11

09 Feb '11

Revision: 5224 http://trac.macosforge.org/projects/ruby/changeset/5224 Author: lsansonetti(a)apple.com Date: 2011-02-08 19:21:27 -0800 (Tue, 08 Feb 2011) Log Message: ----------- fix a bug in rubygems when building gems where tarball data was handled as UTF-8 instead of binary Modified Paths: -------------- MacRuby/trunk/lib/rubygems/package/tar_writer.rb Modified: MacRuby/trunk/lib/rubygems/package/tar_writer.rb =================================================================== --- MacRuby/trunk/lib/rubygems/package/tar_writer.rb 2011-02-09 02:29:50 UTC (rev 5223) +++ MacRuby/trunk/lib/rubygems/package/tar_writer.rb 2011-02-09 03:21:27 UTC (rev 5224) @@ -40,6 +40,9 @@ # number of bytes will be more than #limit def write(data) + # XXX MACRUBY mainly because our File.open won't honor 'b'. + data = data.force_encoding('BINARY') + if data.size + @written > @limit raise FileOverflow, "You tried to feed more data than fits in the file." end

1 0

[5223] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '11

09 Feb '11

Revision: 5223 http://trac.macosforge.org/projects/ruby/changeset/5223 Author: lsansonetti(a)apple.com Date: 2011-02-08 18:29:50 -0800 (Tue, 08 Feb 2011) Log Message: ----------- better RSTRING_{PTR,LEN] for pure NSStrings Modified Paths: -------------- MacRuby/trunk/NSString.m MacRuby/trunk/encoding.h MacRuby/trunk/string.c Modified: MacRuby/trunk/NSString.m =================================================================== --- MacRuby/trunk/NSString.m 2011-02-09 02:28:44 UTC (rev 5222) +++ MacRuby/trunk/NSString.m 2011-02-09 02:29:50 UTC (rev 5223) @@ -427,3 +427,15 @@ rb_objc_define_method(rb_cString, "to_data", rstr_only, 0); rb_objc_define_method(rb_cString, "pointer", rstr_only, 0); } + +const char * +nsstr_cstr(VALUE str) +{ + return [(NSString *)str UTF8String]; +} + +long +nsstr_clen(VALUE str) +{ + return [(NSString *)str lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; +} Modified: MacRuby/trunk/encoding.h =================================================================== --- MacRuby/trunk/encoding.h 2011-02-09 02:28:44 UTC (rev 5222) +++ MacRuby/trunk/encoding.h 2011-02-09 02:29:50 UTC (rev 5223) @@ -378,6 +378,9 @@ VALUE rstr_new_path(const char *path); +const char *nsstr_cstr(VALUE str); +long nsstr_clen(VALUE str); + #if defined(__cplusplus) } // extern "C" #endif Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2011-02-09 02:28:44 UTC (rev 5222) +++ MacRuby/trunk/string.c 2011-02-09 02:29:50 UTC (rev 5223) @@ -6333,24 +6333,7 @@ str_ensure_null_terminator(RSTR(str)); return RSTR(str)->bytes; } - - // CFString code path, hopefully this should not happen very often. - const char *cptr = (const char *)CFStringGetCStringPtr((CFStringRef)str, 0); - if (cptr != NULL) { - return cptr; - } - - const long max = CFStringGetMaximumSizeForEncoding( - CFStringGetLength((CFStringRef)str), - kCFStringEncodingUTF8); - char *cptr2 = (char *)xmalloc(max + 1); - if (!CFStringGetCString((CFStringRef)str, cptr2, max + 1, - kCFStringEncodingUTF8)) { - // Probably an UTF16 string... - xfree(cptr2); - return NULL; - } - return cptr2; + return nsstr_cstr(str); } long @@ -6359,7 +6342,7 @@ if (IS_RSTR(str)) { return RSTR(str)->length_in_bytes; } - return CFStringGetLength((CFStringRef)str); + return nsstr_clen(str); } char *

1 0

[5222] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 09 Feb '11

09 Feb '11

Revision: 5222 http://trac.macosforge.org/projects/ruby/changeset/5222 Author: lsansonetti(a)apple.com Date: 2011-02-08 18:28:44 -0800 (Tue, 08 Feb 2011) Log Message: ----------- fix calls to -[NSString fileSystemRepresentation] to catch potential exceptions Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2011-02-07 22:05:12 UTC (rev 5221) +++ MacRuby/trunk/objc.m 2011-02-09 02:28:44 UTC (rev 5222) @@ -107,6 +107,18 @@ return false; } +static const char * +fileSystemPath(NSString *str) +{ + @try { + return [str fileSystemRepresentation]; + } + @catch (id exc) { + // Sometimes, -fileSystemRepresentation can fail. + } + return [str UTF8String]; +} + VALUE rb_home_dir(VALUE user_name) { @@ -127,7 +139,7 @@ return Qnil; } } - return rb_str_new2([home_dir fileSystemRepresentation]); + return rb_str_new2(fileSystemPath(home_dir)); } static bool @@ -176,7 +188,7 @@ } } - return rb_str_new2([res fileSystemRepresentation]); + return rb_str_new2(fileSystemPath(res)); } VALUE @@ -310,7 +322,7 @@ success: if (cstr == NULL) { - cstr = [path fileSystemRepresentation]; + cstr = fileSystemPath(path); } bundle = [NSBundle bundleWithPath:path]; @@ -674,7 +686,7 @@ for (NSBundle *b in [NSBundle allFrameworks]) { if ([b isLoaded]) { NSString *path = [b bundlePath]; - rb_objc_search_and_load_bridge_support([path fileSystemRepresentation]); + rb_objc_search_and_load_bridge_support(fileSystemPath(path)); } } #endif

1 0

[5221] MacRuby/trunk/thread.c
by source_changes＠macosforge.org 07 Feb '11

07 Feb '11

Revision: 5221 http://trac.macosforge.org/projects/ruby/changeset/5221 Author: lsansonetti(a)apple.com Date: 2011-02-07 14:05:12 -0800 (Mon, 07 Feb 2011) Log Message: ----------- fix a bug in Thread.kill when passing a non-Thread object would cause a crash Modified Paths: -------------- MacRuby/trunk/thread.c Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2011-02-04 02:24:53 UTC (rev 5220) +++ MacRuby/trunk/thread.c 2011-02-07 22:05:12 UTC (rev 5221) @@ -377,6 +377,10 @@ static VALUE rb_thread_s_kill(VALUE obj, SEL sel, VALUE th) { + if (!rb_obj_is_kind_of(th, rb_cThread)) { + rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)", + rb_obj_classname(th)); + } return rb_thread_kill(th, 0); }

1 0

[5220] MacRuby/trunk
by source_changes＠macosforge.org 04 Feb '11

04 Feb '11

Revision: 5220 http://trac.macosforge.org/projects/ruby/changeset/5220 Author: watson1978(a)gmail.com Date: 2011-02-03 18:24:53 -0800 (Thu, 03 Feb 2011) Log Message: ----------- Default value of BasicSocket.do_not_reverse_lookup was changed into true with CRuby 1.9.2. Modified Paths: -------------- MacRuby/trunk/ext/socket/socket.c MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/do_not_reverse_lookup_tags.txt Modified: MacRuby/trunk/ext/socket/socket.c =================================================================== --- MacRuby/trunk/ext/socket/socket.c 2011-02-04 00:45:08 UTC (rev 5219) +++ MacRuby/trunk/ext/socket/socket.c 2011-02-04 02:24:53 UTC (rev 5220) @@ -79,7 +79,7 @@ // TODO #define rb_io_set_nonblock(x) -static int do_not_reverse_lookup = 0; +static int do_not_reverse_lookup = 1; #define FMODE_NOREVLOOKUP 0x100 VALUE rb_cBasicSocket; Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/do_not_reverse_lookup_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/do_not_reverse_lookup_tags.txt 2011-02-04 00:45:08 UTC (rev 5219) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/do_not_reverse_lookup_tags.txt 2011-02-04 02:24:53 UTC (rev 5220) @@ -1 +0,0 @@ -fails:BasicSocket.do_not_reverse_lookup defaults to true

1 0

[5219] MacRuby/trunk/object.c
by source_changes＠macosforge.org 04 Feb '11

04 Feb '11

Revision: 5219 http://trac.macosforge.org/projects/ruby/changeset/5219 Author: pthomson(a)apple.com Date: 2011-02-03 16:45:08 -0800 (Thu, 03 Feb 2011) Log Message: ----------- Allow Float objects to be trusted/untrusted and tainted/untainted. Fixes #1009. Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2011-02-02 14:01:33 UTC (rev 5218) +++ MacRuby/trunk/object.c 2011-02-04 00:45:08 UTC (rev 5219) @@ -765,6 +765,11 @@ return Qnil; } +// In order to mimic 1.9, we allow Floats to be tainted and untrusted, even +// though they are technically immediates. +static st_table *immediate_flags_tbl = 0; + + /* * call-seq: * obj.tainted? => true or false @@ -775,13 +780,19 @@ static VALUE rb_obj_tainted_p(VALUE obj, SEL sel) { - if (SPECIAL_CONST_P(obj)) + if (SPECIAL_CONST_P(obj)) { + if (immediate_flags_tbl && FIXFLOAT_P(obj)) { + VALUE flags = 0; + if (st_lookup(immediate_flags_tbl, obj, &flags) && (flags & FL_TAINT)) { + return Qtrue; + } + } return Qfalse; + } else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: return Qfalse; - case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { return RBASIC(obj)->flags & FL_TAINT ? Qtrue : Qfalse; @@ -827,13 +838,26 @@ { rb_secure(4); if (SPECIAL_CONST_P(obj)) { + if (!FIXFLOAT_P(obj)) { + return obj; + } + else if (!immediate_flags_tbl) { + immediate_flags_tbl = st_init_numtable(); + GC_RETAIN(immediate_flags_tbl); + st_insert(immediate_flags_tbl, obj, (st_data_t)FL_TAINT); + } + else { + VALUE flags = 0; + st_lookup(immediate_flags_tbl, obj, &flags); + flags |= FL_TAINT; + st_insert(immediate_flags_tbl, obj, (st_data_t)flags); + } return obj; } else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: - break; - + return obj; case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { RBASIC(obj)->flags |= FL_TAINT; @@ -883,11 +907,19 @@ rb_obj_untaint_m(VALUE obj, SEL sel) { rb_secure(3); - if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) { + if (SPECIAL_CONST_P(obj)) { + if (immediate_flags_tbl && FIXFLOAT_P(obj)) { + VALUE flags = 0; + st_lookup(immediate_flags_tbl, obj, &flags); + flags &= ~FL_TAINT; + st_insert(immediate_flags_tbl, obj, (st_data_t)flags); + } + return obj; + } + else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: - break; - + return obj; case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { RBASIC(obj)->flags &= ~FL_TAINT; @@ -928,11 +960,19 @@ static VALUE rb_obj_untrusted_imp(VALUE obj, SEL sel) { - if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) { + if (SPECIAL_CONST_P(obj)) { + if (immediate_flags_tbl && FIXFLOAT_P(obj)) { + VALUE flags = 0; + if (st_lookup(immediate_flags_tbl, obj, &flags) && (flags && FL_UNTRUSTED)) { + return Qtrue; + } + } + return Qfalse; + } + else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: - return Qfalse; - + return Qfalse; case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { return RBASIC(obj)->flags & FL_UNTRUSTED ? Qtrue : Qfalse; @@ -971,11 +1011,27 @@ if (OBJ_FROZEN(obj)) { rb_error_frozen("object"); } - if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) { + else if (SPECIAL_CONST_P(obj)) { + if(!FIXFLOAT_P(obj)) { + return obj; + } + else if(!immediate_flags_tbl) { + immediate_flags_tbl = st_init_numtable(); + GC_RETAIN(immediate_flags_tbl); + st_insert(immediate_flags_tbl, obj, FL_UNTRUSTED); + } + else { + VALUE flags = 0; + st_lookup(immediate_flags_tbl, obj, &flags); + flags &= ~FL_UNTRUSTED; + st_insert(immediate_flags_tbl, obj, (st_data_t)flags); + } + return obj; + } + else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: - break; - + return obj; case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { RBASIC(obj)->flags &= ~FL_UNTRUSTED; @@ -1017,11 +1073,27 @@ if (OBJ_FROZEN(obj)) { rb_error_frozen("object"); } - if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) { + else if (SPECIAL_CONST_P(obj)) { + if (!FIXFLOAT_P(obj)) { + return obj; + } + else if (!immediate_flags_tbl) { + immediate_flags_tbl = st_init_numtable(); + GC_RETAIN(immediate_flags_tbl); + st_insert(immediate_flags_tbl, obj, (st_data_t)FL_UNTRUSTED); + } + else { + VALUE flags = 0; + st_lookup(immediate_flags_tbl, obj, &flags); + flags |= FL_UNTRUSTED; + st_insert(immediate_flags_tbl, obj, (st_data_t)flags); + } + return obj; + } + else if (NATIVE(obj)) { switch (TYPE(obj)) { case T_SYMBOL: - break; - + return Qfalse; case T_ARRAY: if (rb_klass_is_rary(*(VALUE *)obj)) { RBASIC(obj)->flags |= FL_UNTRUSTED; @@ -1061,8 +1133,6 @@ OBJ_INFECT(obj1, obj2); } -static st_table *immediate_frozen_tbl = 0; - /* * call-seq: * obj.freeze => obj @@ -1092,11 +1162,18 @@ } else if (SPECIAL_CONST_P(obj)) { immediate: - if (!immediate_frozen_tbl) { - immediate_frozen_tbl = st_init_numtable(); - GC_RETAIN(immediate_frozen_tbl); + if (!immediate_flags_tbl) { + immediate_flags_tbl = st_init_numtable(); + GC_RETAIN(immediate_flags_tbl); + st_insert(immediate_flags_tbl, obj, (st_data_t)FL_FREEZE); + } + else { + VALUE flags = 0; + st_lookup(immediate_flags_tbl, obj, &flags); + flags |= FL_FREEZE; + st_insert(immediate_flags_tbl, obj, (st_data_t)flags); } - st_insert(immediate_frozen_tbl, obj, (st_data_t)Qtrue); + return obj; } else if ((type = TYPE(obj)) == T_CLASS || type == T_MODULE) { RCLASS_SET_VERSION_FLAG(obj, RCLASS_IS_FROZEN); @@ -1156,12 +1233,12 @@ { if (SPECIAL_CONST_P(obj)) { immediate: - if (!immediate_frozen_tbl) { - return Qfalse; + if (immediate_flags_tbl) { + VALUE flags = 0; + if (st_lookup(immediate_flags_tbl, obj, &flags) && (flags & FL_FREEZE)) { + return Qtrue; + } } - if (st_lookup(immediate_frozen_tbl, obj, 0)) { - return Qtrue; - } return Qfalse; } switch (TYPE(obj)) {

1 0