[llvm-commits] [dragonegg] r94212 - in /dragonegg/trunk: llvm-convert.cpp llvm-internal.h

[Duncan Sands]

Author: baldrick
Date: Fri Jan 22 14:55:17 2010
New Revision: 94212

URL: http://llvm.org/viewvc/llvm-project?rev=94212&view=rev
Log:
Random small cleanups, most notably the elimination of
EmitReg_NOP_EXPR since it is exactly the same as
EmitReg_CONVERT_EXPR.

Modified:
    dragonegg/trunk/llvm-convert.cpp
    dragonegg/trunk/llvm-internal.h

Modified: dragonegg/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-convert.cpp?rev=94212&r1=94211&r2=94212&view=diff

==============================================================================
--- dragonegg/trunk/llvm-convert.cpp (original)
+++ dragonegg/trunk/llvm-convert.cpp Fri Jan 22 14:55:17 2010
@@ -5908,7 +5908,7 @@
       ICmpInst::ICMP_UGE : ICmpInst::ICMP_SGE;
     Value *Cmp = Builder.CreateICmp(pred, Op,
                     Constant::getNullValue(Op->getType()), "abscond");
-    return Builder.CreateSelect(Cmp, Op, OpN, "abs");
+    return Builder.CreateSelect(Cmp, Op, OpN, Op->getName()+"abs");
   }
 
   // Turn FP abs into fabs/fabsf.
@@ -5933,7 +5933,7 @@
 
 Value *TreeToLLVM::EmitReg_BIT_NOT_EXPR(tree op) {
   Value *Op = EmitRegister(op);
-  return Builder.CreateNot(Op, Op->getName() + "not");
+  return Builder.CreateNot(Op, Op->getName()+"not");
 }
 
 Value *TreeToLLVM::EmitReg_CONJ_EXPR(tree op) {
@@ -5948,10 +5948,8 @@
 }
 
 Value *TreeToLLVM::EmitReg_CONVERT_EXPR(tree type, tree op) {
-  bool OpIsSigned = !TYPE_UNSIGNED(TREE_TYPE(op));
-  bool ExpIsSigned = !TYPE_UNSIGNED(type);
-  return CastToAnyType(EmitRegister(op), OpIsSigned, GetRegType(type),
-                       ExpIsSigned);
+  return CastToAnyType(EmitRegister(op), !TYPE_UNSIGNED(TREE_TYPE(op)),
+                       GetRegType(type), !TYPE_UNSIGNED(type));
 }
 
 Value *TreeToLLVM::EmitReg_NEGATE_EXPR(tree op) {
@@ -5977,15 +5975,6 @@
   return CreateComplex(R, I, TREE_TYPE(TREE_TYPE(op)));
 }
 
-Value *TreeToLLVM::EmitReg_NOP_EXPR(tree type, tree op) {
-  const Type *Ty = GetRegType(type);
-  bool OpIsSigned = !TYPE_UNSIGNED(TREE_TYPE(op));
-  bool ExpIsSigned = !TYPE_UNSIGNED(type);
-  // Scalar to scalar copy.
-  assert(!AGGREGATE_TYPE_P(TREE_TYPE(op)) && "Aggregate to scalar nop_expr!");
-  return CastToAnyType(EmitRegister(op), OpIsSigned, Ty, ExpIsSigned);
-}
-
 Value *TreeToLLVM::EmitReg_PAREN_EXPR(tree op) {
   // TODO: Understand and correctly deal with this subtle expression.
   return EmitRegister(op);
@@ -7140,11 +7129,10 @@
   case CONVERT_EXPR:
   case FIX_TRUNC_EXPR:
   case FLOAT_EXPR:
+  case NOP_EXPR:
     RHS = EmitReg_CONVERT_EXPR(type, rhs1); break;
   case NEGATE_EXPR:
     RHS = EmitReg_NEGATE_EXPR(rhs1); break;
-  case NOP_EXPR:
-    RHS = EmitReg_NOP_EXPR(type, rhs1); break;
   case PAREN_EXPR:
     RHS = EmitReg_PAREN_EXPR(rhs1); break;
   case TRUTH_NOT_EXPR:

Modified: dragonegg/trunk/llvm-internal.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-internal.h?rev=94212&r1=94211&r2=94212&view=diff

==============================================================================
--- dragonegg/trunk/llvm-internal.h (original)
+++ dragonegg/trunk/llvm-internal.h Fri Jan 22 14:55:17 2010
@@ -606,7 +606,6 @@
   Value *EmitReg_CONJ_EXPR(tree_node *op);
   Value *EmitReg_CONVERT_EXPR(tree_node *type, tree_node *op);
   Value *EmitReg_NEGATE_EXPR(tree_node *op);
-  Value *EmitReg_NOP_EXPR(tree_node *type, tree_node *op);
   Value *EmitReg_PAREN_EXPR(tree_node *exp);
   Value *EmitReg_TRUTH_NOT_EXPR(tree_node *type, tree_node *op);