codegen: Support {Not,Logical,Identity}Exp with non-bool type (for im…

…portC AST)

Fixing failing LDC assertions.

gen/toir.cpp

@@ -168,6 +168,16 @@ void pushVarDtorCleanup(IRState *p, VarDeclaration *vd) {
   toElemDtor(vd->edtor);
   p->funcGen().scopes.pushCleanup(beginBB, p->scopebb());
 }
+
+DImValue *zextInteger(LLValue *val, Type *to) {
+  assert(val->getType()->isIntegerTy());
+  LLType *llTy = DtoType(to);
+  if (val->getType() != llTy) {
+    assert(llTy->isIntegerTy());
+    val = gIR->ir->CreateZExt(val, llTy);
+  }
+  return new DImValue(to, val);
+}
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1331,14 +1341,7 @@ class ToElemVisitor : public Visitor {
       llvm_unreachable("Unsupported EqualExp type.");
     }
 
-    // optionally zero-extend i1 to larger integer type
-    LLType *llTy = DtoType(e->type);
-    if (eval->getType() != llTy) {
-      assert(llTy->isIntegerTy());
-      eval = new llvm::ZExtInst(eval, llTy, "", gIR->scopebb());
-    }
-
-    result = new DImValue(e->type, eval);
+    result = zextInteger(eval, e->type);
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -1713,7 +1716,7 @@ class ToElemVisitor : public Visitor {
     LLConstant *zero = DtoConstBool(false);
     b = p->ir->CreateICmpEQ(b, zero);
 
-    result = new DImValue(e->type, b);
+    result = zextInteger(b, e->type);
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -1789,7 +1792,7 @@ class ToElemVisitor : public Visitor {
       resval = phi;
     }
 
-    result = new DImValue(e->type, resval);
+    result = zextInteger(resval, e->type);
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -1889,12 +1892,12 @@ class ToElemVisitor : public Visitor {
 
     // handle dynarray specially
     if (t1->ty == TY::Tarray) {
-      result = new DImValue(e->type, DtoDynArrayIs(e->op, l, r));
+      result = zextInteger(DtoDynArrayIs(e->op, l, r), e->type);
       return;
     }
     // also structs
     if (t1->ty == TY::Tstruct) {
-      result = new DImValue(e->type, DtoStructEquals(e->op, l, r));
+      result = zextInteger(DtoStructEquals(e->op, l, r), e->type);
       return;
     }
 
@@ -1941,7 +1944,7 @@ class ToElemVisitor : public Visitor {
                                                               : EXP::notEqual);
       }
     }
-    result = new DImValue(e->type, eval);
+    result = zextInteger(eval, e->type);
   }
 
   //////////////////////////////////////////////////////////////////////////////