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

[5269] MacRuby/trunk
by source_changes＠macosforge.org 10 Mar '11

10 Mar '11

Revision: 5269 http://trac.macosforge.org/projects/ruby/changeset/5269 Author: lsansonetti(a)apple.com Date: 2011-03-09 16:01:04 -0800 (Wed, 09 Mar 2011) Log Message: ----------- add support for llvm 2.9, test it by passing CFLAGS=-D__SUPPORT_LLVM_29__ to rake Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/debugger.cpp MacRuby/trunk/llvm.h MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/bridgesupport.cpp 2011-03-10 00:01:04 UTC (rev 5269) @@ -18,6 +18,9 @@ # include <llvm/Instructions.h> # include <llvm/Intrinsics.h> # include <llvm/Analysis/DebugInfo.h> +# if __SUPPORT_LLVM_29__ +# include <llvm/Analysis/DIBuilder.h> +# endif # include <llvm/ExecutionEngine/JIT.h> # include <llvm/PassManager.h> # include <llvm/Target/TargetData.h> Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/compiler.cpp 2011-03-10 00:01:04 UTC (rev 5269) @@ -150,7 +150,11 @@ RoxorCompiler::RoxorCompiler(bool _debug_mode) { assert(RoxorCompiler::module != NULL); +#if __SUPPORT_LLVM_29__ + debug_info = new DIBuilder(*RoxorCompiler::module); +#else debug_info = new DIFactory(*RoxorCompiler::module); +#endif can_interpret = false; debug_mode = _debug_mode; @@ -835,8 +839,18 @@ RoxorCompiler::attach_current_line_metadata(Instruction *insn) { if (fname != NULL) { +#if __SUPPORT_LLVM_29__ + Value *args[] = { + ConstantInt::get(Int32Ty, current_line), + ConstantInt::get(Int32Ty, 0), + debug_compile_unit, + DILocation(NULL) + }; + DILocation loc = DILocation(MDNode::get(context, args, 4)); +#else DILocation loc = debug_info->CreateLocation(current_line, 0, debug_compile_unit, DILocation(NULL)); +#endif insn->setMetadata(dbg_mdkind, loc); } } @@ -4880,8 +4894,14 @@ assert(strlen(dir) > 0); assert(strlen(base) > 0); +#if __SUPPORT_LLVM_29__ + debug_info->createCompileUnit(DW_LANG_Ruby, base, dir, + RUBY_DESCRIPTION, true, "", 1); + debug_compile_unit = DICompileUnit(debug_info->getCU()); +#else debug_compile_unit = debug_info->CreateCompileUnit(DW_LANG_Ruby, base, dir, RUBY_DESCRIPTION, false, false, ""); +#endif } } } Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/compiler.h 2011-03-10 00:01:04 UTC (rev 5269) @@ -79,7 +79,11 @@ void generate_location_path(std::string &path, DILocation loc); protected: +#if __SUPPORT_LLVM_29__ + DIBuilder *debug_info; +#else DIFactory *debug_info; +#endif DICompileUnit debug_compile_unit; DISubprogram debug_subprogram; Modified: MacRuby/trunk/debugger.cpp =================================================================== --- MacRuby/trunk/debugger.cpp 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/debugger.cpp 2011-03-10 00:01:04 UTC (rev 5269) @@ -15,6 +15,9 @@ #include <llvm/Instructions.h> #include <llvm/Intrinsics.h> #include <llvm/Analysis/DebugInfo.h> +#if __SUPPORT_LLVM_29__ +# include <llvm/Analysis/DIBuilder.h> +#endif #include <llvm/ExecutionEngine/JIT.h> #include <llvm/PassManager.h> #include <llvm/Target/TargetData.h> Modified: MacRuby/trunk/llvm.h =================================================================== --- MacRuby/trunk/llvm.h 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/llvm.h 2011-03-10 00:01:04 UTC (rev 5269) @@ -17,6 +17,9 @@ #include <llvm/Instructions.h> #include <llvm/Intrinsics.h> #include <llvm/Analysis/DebugInfo.h> +#if __SUPPORT_LLVM_29__ +# include <llvm/Analysis/DIBuilder.h> +#endif #include <llvm/ExecutionEngine/JIT.h> #include <llvm/PassManager.h> #include <llvm/Target/TargetData.h> Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2011-03-09 23:59:37 UTC (rev 5268) +++ MacRuby/trunk/vm.cpp 2011-03-10 00:01:04 UTC (rev 5269) @@ -21,6 +21,9 @@ # include <llvm/Instructions.h> # include <llvm/PassManager.h> # include <llvm/Analysis/DebugInfo.h> +# if __SUPPORT_LLVM_29__ +# include <llvm/Analysis/DIBuilder.h> +# endif # include <llvm/Analysis/Verifier.h> # include <llvm/Target/TargetData.h> # include <llvm/CodeGen/MachineFunction.h> @@ -35,6 +38,9 @@ # include <llvm/Transforms/Scalar.h> # include <llvm/Transforms/IPO.h> # include <llvm/Support/raw_ostream.h> +# if __SUPPORT_LLVM_29__ +# include <llvm/Support/system_error.h> +# endif # include <llvm/Support/PrettyStackTrace.h> # include <llvm/Support/MemoryBuffer.h> # include <llvm/Support/StandardPasses.h> @@ -4923,11 +4929,23 @@ // To not corrupt stack pointer (essential for backtracing). llvm::NoFramePointerElim = true; - MemoryBuffer *mbuf; + MemoryBuffer *mbuf = NULL; const char *kernel_file = getenv("VM_KERNEL_PATH"); if (kernel_file != NULL) { std::string err; +#if __SUPPORT_LLVM_29__ + OwningPtr<MemoryBuffer> MB; + error_code errcode = MemoryBuffer::getFile(kernel_file, MB); + if (errcode) { + err = errcode.message(); + } + else { + mbuf = MB.take(); + assert(mbuf != NULL); + } +#else mbuf = MemoryBuffer::getFile(kernel_file, &err); +#endif if (mbuf == NULL) { printf("can't open given kernel file `%s': %s\n", kernel_file, err.c_str());

1 0

[5268] MacRuby/trunk/rakelib/builder/options.rb
by source_changes＠macosforge.org 09 Mar '11

09 Mar '11

Revision: 5268 http://trac.macosforge.org/projects/ruby/changeset/5268 Author: lsansonetti(a)apple.com Date: 2011-03-09 15:59:37 -0800 (Wed, 09 Mar 2011) Log Message: ----------- allow extra flags to be passed to the compiler via the CFLAGS rakefile variable Modified Paths: -------------- MacRuby/trunk/rakelib/builder/options.rb Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2011-03-09 01:02:33 UTC (rev 5267) +++ MacRuby/trunk/rakelib/builder/options.rb 2011-03-09 23:59:37 UTC (rev 5268) @@ -60,6 +60,8 @@ end CXX = b.option('CXX', default_CXX) +EXTRA_CFLAGS = b.option('CFLAGS', '') + # Everything below this comment should *not* be modified. if ENV['build_as_embeddable'] @@ -152,8 +154,8 @@ sdk = opt.delete(:sdk) has_libauto = sdk ? File.exist?("#{sdk}/usr/lib/libauto.dylib") : true archflags = archs.map { |x| "-arch #{x}" }.join(' ') - @cflags = "-std=c99 -I. -I./include -pipe -fno-common -fexceptions -fblocks -g -O#{OPTZ_LEVEL} -Wall -Wno-deprecated-declarations -Werror #{archflags}" - @cxxflags = "-I. -I./include -fblocks -g -Wall -Wno-deprecated-declarations -Werror #{archflags}" + @cflags = "-std=c99 -I. -I./include -pipe -fno-common -fexceptions -fblocks -g -O#{OPTZ_LEVEL} -Wall -Wno-deprecated-declarations -Werror #{archflags} #{EXTRA_CFLAGS}" + @cxxflags = "-I. -I./include -fblocks -g -Wall -Wno-deprecated-declarations -Werror #{archflags} #{EXTRA_CFLAGS}" @ldflags = '-lpthread -ldl -lxml2 -lobjc -licucore -framework Foundation' @ldflags << " -lauto" if has_libauto if opt.delete(:static)

1 0

[5267] MacRuby/tags/0.9/
by source_changes＠macosforge.org 09 Mar '11

09 Mar '11

Revision: 5267 http://trac.macosforge.org/projects/ruby/changeset/5267 Author: lsansonetti(a)apple.com Date: 2011-03-08 17:02:33 -0800 (Tue, 08 Mar 2011) Log Message: ----------- tagging 0.9 branch as 0.9 Added Paths: ----------- MacRuby/tags/0.9/ Property changes on: MacRuby/tags/0.9 ___________________________________________________________________ Added: svn:ignore + # Binary files. *.o .ext miniruby markgc macruby *.rbo *.dylib # Generated files. .installed.list doc include/ruby/config.h dtrace.h revision.h parse.c y.tab.c lex.c miniprelude.c node_name.inc prelude.c rbconfig.rb Added: svn:mergeinfo + /MacRuby/branches/icu:3533-3744 /MacRuby/trunk:5240,5242

1 0

[5266] MacRuby/trunk
by source_changes＠macosforge.org 08 Mar '11

08 Mar '11

Revision: 5266 http://trac.macosforge.org/projects/ruby/changeset/5266 Author: watson1978(a)gmail.com Date: 2011-03-08 05:39:22 -0800 (Tue, 08 Mar 2011) Log Message: ----------- Implements the Set#{keep_if, select!}. Modified Paths: -------------- MacRuby/trunk/lib/set.rb MacRuby/trunk/spec/frozen/tags/macruby/library/set/keep_if_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/set/select_tags.txt Modified: MacRuby/trunk/lib/set.rb =================================================================== --- MacRuby/trunk/lib/set.rb 2011-03-08 04:49:56 UTC (rev 5265) +++ MacRuby/trunk/lib/set.rb 2011-03-08 13:39:22 UTC (rev 5266) @@ -266,6 +266,14 @@ self end + # Deletes every element of the set for which block evaluates to + # false, and returns self. + def keep_if + block_given? or return enum_for(__method__) + to_a.each { |o| @hash.delete(o) unless yield(o) } + self + end + # Replaces the elements with ones returned by collect(). def collect! block_given? or return enum_for(__method__) @@ -284,6 +292,15 @@ size == n ? nil : self end + # Equivalent to Set#keep_if, but returns nil if no changes were + # made. + def select! + block_given? or return enum_for(__method__) + n = size + keep_if { |o| yield(o) } + size == n ? nil : self + end + # Merges the elements of the given enumerable object to the set and # returns self. def merge(enum) @@ -563,6 +580,14 @@ self end + def keep_if + block_given? or return enum_for(__method__) + n = @hash.size + super + @keys = nil if @hash.size != n + self + end + def merge(enum) @keys = nil super Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/set/keep_if_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/set/keep_if_tags.txt 2011-03-08 04:49:56 UTC (rev 5265) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/set/keep_if_tags.txt 2011-03-08 13:39:22 UTC (rev 5266) @@ -1,4 +0,0 @@ -fails:Set#keep_if yields every element of self -fails:Set#keep_if keeps every element from self for which the passed block returns true -fails:Set#keep_if returns self -fails:Set#keep_if returns an Enumerator when passed no block Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/set/select_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/set/select_tags.txt 2011-03-08 04:49:56 UTC (rev 5265) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/set/select_tags.txt 2011-03-08 13:39:22 UTC (rev 5266) @@ -1,5 +0,0 @@ -fails:Set#select! yields every element of self -fails:Set#select! keeps every element from self for which the passed block returns true -fails:Set#select! returns self when self was modified -fails:Set#select! returns nil when self was not modified -fails:Set#select! returns an Enumerator when passed no block

1 0

[5265] MacRuby/trunk
by source_changes＠macosforge.org 08 Mar '11

08 Mar '11

Revision: 5265 http://trac.macosforge.org/projects/ruby/changeset/5265 Author: lsansonetti(a)apple.com Date: 2011-03-07 20:49:56 -0800 (Mon, 07 Mar 2011) Log Message: ----------- fix a bug when compiling recursive method calls when methods actually re-define themselves on the fly (this fixes the mustache library) Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2011-03-08 03:31:53 UTC (rev 5264) +++ MacRuby/trunk/compiler.cpp 2011-03-08 04:49:56 UTC (rev 5265) @@ -3098,22 +3098,52 @@ const unsigned long argc = args == NULL ? 0 : args->nd_alen; if (f->arg_size() - 2 == argc) { + // We check a global variable that we initialize to 0 in order + // to verify that the current method did not overwrite itself. + // This can happen. In this case, we do a normal dispatch. + SEL sel = mid_to_sel(mid, positive_arity ? 1 : 0); + GlobalVariable *gvar = GET_CORE()->redefined_op_gvar(sel, true); + new StoreInst(ConstantInt::get(Type::getInt8Ty(context), 0), gvar, + f->getEntryBlock().getFirstNonPHI()); + Value *isNotRedefined = new ICmpInst(*bb, ICmpInst::ICMP_EQ, + new LoadInst(gvar, "", bb), ConstantInt::get(Int8Ty, 0)); + + BasicBlock *thenBB = BasicBlock::Create(context, "op_not_redef", f); + BasicBlock *elseBB = BasicBlock::Create(context, "op_dispatch", f); + BasicBlock *mergeBB = BasicBlock::Create(context, "op_merge", f); + + BranchInst::Create(thenBB, elseBB, isNotRedefined, bb); + + // Compile optimized recursive call. + bb = thenBB; std::vector<Value *> params; - Function::arg_iterator arg = f->arg_begin(); - params.push_back(arg++); // self params.push_back(arg++); // sel - for (NODE *n = args; n != NULL; n = n->nd_next) { params.push_back(compile_node(n->nd_head)); } - CallInst *inst = CallInst::Create(f, params.begin(), params.end(), "", bb); - // Promote for tail call elimitation. - inst->setTailCall(true); - return cast<Value>(inst); + inst->setTailCall(true); // Promote for tail call elimitation. + Value *optz_value = cast<Value>(inst); + thenBB = bb; + BranchInst::Create(mergeBB, bb); + + // Compile regular dispatch call. + bb = elseBB; + ID old_current_mid = current_mid; + current_mid = 0; // To force a normal dispatch compilation. + Value *unoptz_value = compile_call(node); + current_mid = old_current_mid; + elseBB = bb; + BranchInst::Create(mergeBB, bb); + + bb = mergeBB; + PHINode *pn = PHINode::Create(RubyObjTy, "", bb); + pn->addIncoming(optz_value, thenBB); + pn->addIncoming(unoptz_value, elseBB); + return pn; } } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2011-03-08 03:31:53 UTC (rev 5264) +++ MacRuby/trunk/vm.cpp 2011-03-08 04:49:56 UTC (rev 5265) @@ -907,8 +907,8 @@ return true; } - printf("invalid inline op `%s' to invalidate!\n", sel_getName(sel)); - abort(); + // Assume yes by default. + return true; } static ID

1 0

[5264] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 08 Mar '11

08 Mar '11

Revision: 5264 http://trac.macosforge.org/projects/ruby/changeset/5264 Author: watson1978(a)gmail.com Date: 2011-03-07 19:31:53 -0800 (Mon, 07 Mar 2011) Log Message: ----------- Thread#kill cancels safely the Thread in while Thread is handling termination. Fix #794. Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2011-03-07 22:19:04 UTC (rev 5263) +++ MacRuby/trunk/vm.cpp 2011-03-08 03:31:53 UTC (rev 5264) @@ -4745,10 +4745,14 @@ void rb_vm_thread_cancel(rb_vm_thread_t *t) { + RoxorCoreLock lock; + if (t->status != THREAD_KILLED && t->status != THREAD_DEAD) { t->status = THREAD_KILLED; if (t->thread == pthread_self()) { + lock.unlock(); rb_vm_thread_throw_kill(); + return; } else { pthread_assert(pthread_mutex_lock(&t->sleep_mutex)); @@ -4767,6 +4771,7 @@ pthread_assert(pthread_mutex_unlock(&t->sleep_mutex)); } } + lock.unlock(); } extern "C"

1 0

[5263] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5263 http://trac.macosforge.org/projects/ruby/changeset/5263 Author: lsansonetti(a)apple.com Date: 2011-03-07 14:19:04 -0800 (Mon, 07 Mar 2011) Log Message: ----------- fix a bug when using --gem on gems containing a space character in their paths would break the deployment (patch by mrada at marketcircle.com) Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-03-07 22:11:42 UTC (rev 5262) +++ MacRuby/trunk/bin/ruby_deploy 2011-03-07 22:19:04 UTC (rev 5263) @@ -178,7 +178,7 @@ 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| - execute("/usr/bin/ditto #{libdir} #{gems_libdirs_dest}") + execute("/usr/bin/ditto \"#{libdir}\" \"#{gems_libdirs_dest}\"") end end

1 0

[5262] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5262 http://trac.macosforge.org/projects/ruby/changeset/5262 Author: lsansonetti(a)apple.com Date: 2011-03-07 14:11:42 -0800 (Mon, 07 Mar 2011) Log Message: ----------- during --embed, fix the libmacruby dyld identification name, to conform to App Store submission rules (patch by rsepulveda2 at gmail.com) Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-03-07 22:03:22 UTC (rev 5261) +++ MacRuby/trunk/bin/ruby_deploy 2011-03-07 22:11:42 UTC (rev 5262) @@ -214,6 +214,13 @@ execute("#{@install_name_tool} -change #{macruby_usr}/lib/libmacruby.dylib @executable_path/../Frameworks/MacRuby.framework/Versions/#{@macruby_install_version}/usr/lib/libmacruby.dylib '#{bin}'") end end + log "Fix identification name of libmacruby" + patterns = [ File.join(app_macruby_usr, 'lib/libmacruby*.dylib') ] + patterns.each do |pat| + Dir.glob(pat).each do |bin| + execute("#{@install_name_tool} -id @executable_path/../Frameworks/MacRuby.framework/Versions/#{@macruby_install_version}/usr/lib/libmacruby.dylib '#{bin}'") + end + end end def execute(line, error_message = nil)

1 0

[5261] MacRuby/trunk/lib/ostruct.rb
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5261 http://trac.macosforge.org/projects/ruby/changeset/5261 Author: lsansonetti(a)apple.com Date: 2011-03-07 14:03:22 -0800 (Mon, 07 Mar 2011) Log Message: ----------- avoid using regexp, to not overwrite globals (patch by scottg at eluddite.org) Modified Paths: -------------- MacRuby/trunk/lib/ostruct.rb Modified: MacRuby/trunk/lib/ostruct.rb =================================================================== --- MacRuby/trunk/lib/ostruct.rb 2011-03-07 08:16:17 UTC (rev 5260) +++ MacRuby/trunk/lib/ostruct.rb 2011-03-07 22:03:22 UTC (rev 5261) @@ -80,7 +80,7 @@ def method_missing(mid, *args) # :nodoc: mname = mid.id2name len = args.length - if mname =~ /=$/ + if mname.end_with?('=') if len != 1 raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1) end

1 0

[5260] MacRuby/trunk/hash.c
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5260 http://trac.macosforge.org/projects/ruby/changeset/5260 Author: watson1978(a)gmail.com Date: 2011-03-07 00:16:17 -0800 (Mon, 07 Mar 2011) Log Message: ----------- removed an unnecessary check in r5259. Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/5259 Modified Paths: -------------- MacRuby/trunk/hash.c Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2011-03-07 07:30:41 UTC (rev 5259) +++ MacRuby/trunk/hash.c 2011-03-07 08:16:17 UTC (rev 5260) @@ -897,15 +897,9 @@ { RETURN_ENUMERATOR(hash, 0, 0); rhash_modify(hash); - if (!RHASH(hash)->tbl) { - return Qnil; - } const long n = rhash_len(hash); rb_hash_foreach(hash, keep_if_i, hash); - if (n == rhash_len(hash)) { - return Qnil; - } - return hash; + return n == rhash_len(hash) ? Qnil : hash; } /*

1 0