[macruby-changes] [4993] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4993
          http://trac.macosforge.org/projects/ruby/changeset/4993
Author:   lsansonetti at apple.com
Date:     2010-12-07 16:26:31 -0800 (Tue, 07 Dec 2010)
Log Message:
-----------
move to llvm 2.8

Modified Paths:
--------------
    MacRuby/trunk/README.rdoc
    MacRuby/trunk/compiler.cpp
    MacRuby/trunk/interpreter.cpp

Modified: MacRuby/trunk/README.rdoc
===================================================================
--- MacRuby/trunk/README.rdoc	2010-12-07 09:27:07 UTC (rev 4992)
+++ MacRuby/trunk/README.rdoc	2010-12-08 00:26:31 UTC (rev 4993)
@@ -24,11 +24,11 @@
 * LLVM ToT, compiled for both i386 and x86_64.
 
   LLVM is a moving target and breaks periodically. We recommend to install
-  revision 106781, being sure to specify the correct C and C++ compilers through 
+  revision tag 2.8, being sure to specify the correct C and C++ compilers through 
   environment variables. 
 
-    $ svn co -r 106781 https://llvm.org/svn/llvm-project/llvm/trunk llvm-trunk
-    $ cd llvm-trunk
+    $ svn co https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_28 llvm-2.8
+    $ cd llvm-2.8
     $ env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" CC=/usr/bin/gcc CXX=/usr/bin/g++ ./configure --enable-bindings=none --enable-optimized --with-llvmgccdir=/tmp
     $ env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" CC=/usr/bin/gcc CXX=/usr/bin/g++ make
     $ sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" CC=/usr/bin/gcc CXX=/usr/bin/g++ make install

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2010-12-07 09:27:07 UTC (rev 4992)
+++ MacRuby/trunk/compiler.cpp	2010-12-08 00:26:31 UTC (rev 4993)
@@ -316,8 +316,12 @@
     level = 0;
 #endif
 
+#if LLVM_TOT
     dbg_mdkind = context.getMDKindID("dbg");
     assert(dbg_mdkind != 0);
+#else
+    dbg_mdkind = LLVMContext::MD_dbg;
+#endif
 }
 
 RoxorAOTCompiler::RoxorAOTCompiler(void)
@@ -2919,7 +2923,11 @@
 		new_rescue_invoke_bb->use_begin();
 		rescue_use_it != new_rescue_invoke_bb->use_end();
 		rescue_use_it = new_rescue_invoke_bb->use_begin()) {
-	    InvokeInst* invoke = dyn_cast<InvokeInst>(rescue_use_it);
+#if LLVM_TOT
+	    InvokeInst *invoke = dyn_cast<InvokeInst>(rescue_use_it);
+#else
+	    InvokeInst *invoke = dyn_cast<InvokeInst>(*rescue_use_it);
+#endif
 	    assert(invoke != NULL);
 
 	    // Transform the InvokeInst in CallInst.

Modified: MacRuby/trunk/interpreter.cpp
===================================================================
--- MacRuby/trunk/interpreter.cpp	2010-12-07 09:27:07 UTC (rev 4992)
+++ MacRuby/trunk/interpreter.cpp	2010-12-08 00:26:31 UTC (rev 4993)
@@ -39,7 +39,11 @@
 static inline Value *
 call_arg(CallInst *insn, unsigned int i)
 {
+#if LLVM_TOT
     return insn->getOperand(i + 1);
+#else
+    return insn->getArgOperand(i);
+#endif
 }
 
 static inline uint64_t
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101207/9b97ca24/attachment.html>