[macruby-changes] [4953] MacRuby/trunk/compiler.cpp

[source_changes at macosforge.org]

Revision: 4953
          http://trac.macosforge.org/projects/ruby/changeset/4953
Author:   lsansonetti at apple.com
Date:     2010-11-26 18:34:35 -0800 (Fri, 26 Nov 2010)
Log Message:
-----------
correct a problem introduced in previous commit (r4952)

Revision Links:
--------------
    http://trac.macosforge.org/projects/ruby/changeset/4952

Modified Paths:
--------------
    MacRuby/trunk/compiler.cpp

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2010-11-26 22:06:56 UTC (rev 4952)
+++ MacRuby/trunk/compiler.cpp	2010-11-27 02:34:35 UTC (rev 4953)
@@ -6024,7 +6024,7 @@
 	ret_type = VoidTy;
     }
 
-#if !__LP64__
+#if !defined(__LP64__)
     const Type *small_struct_type = NULL;
     if (ret_type->getTypeID() == Type::StructTyID
 	    && GET_CORE()->get_sizeof(ret_type) == 8) {
@@ -6121,17 +6121,18 @@
     }
 
     GetFirstType(types, buf, buf_len);
+    ret_type = convert_type(buf);
     if (self_arg != NULL && ret_type == VoidTy) {
 	// If we are calling an Objective-C method that returns void, let's
 	// return the receiver instead of nil, for convenience purposes.
 	retval = self_arg;
     }
     else {
-#if !__LP64__
+#if !defined(__LP64__)
 	if (small_struct_type != NULL) {
 	    Value *slot = new AllocaInst(small_struct_type, "", bb);
 	    new StoreInst(retval,
-		    new BitCastInst(slot, PointerType::getUnqual(ret_type),
+		    new BitCastInst(slot, PointerType::getUnqual(Int64Ty),
 			"", bb),
 		    bb);
 	    retval = new LoadInst(slot, "", bb);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101126/7e97e4a3/attachment.html>