[llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.282 -> 1.283
---
Log message:

Only emit a cast to the return type if required.


---
Diffs of the changes:  (+3 -1)

 Compiler.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.282 llvm-java/lib/Compiler/Compiler.cpp:1.283
--- llvm-java/lib/Compiler/Compiler.cpp:1.282	Thu Apr 21 18:07:10 2005
+++ llvm-java/lib/Compiler/Compiler.cpp	Sat May  7 11:37:37 2005
@@ -879,7 +879,9 @@
     void do_return_common(const Type* type) {
       Value* r = pop(type);
       const Type* retTy = currentBB_->getParent()->getReturnType();
-      new ReturnInst(new CastInst(r, retTy, TMP, currentBB_), currentBB_);
+      if (retTy != r->getType())
+        r = new CastInst(r, retTy, TMP, currentBB_);
+      new ReturnInst(r, currentBB_);
     }
 
     void do_return() {