Commits

Iain Buclaw committed 996b2b5

Built on GCC-4.7 passes testsuite.

  • Participants
  • Parent commits 37fe4c2

Comments (0)

Files changed (2)

 
     // for force_result_type, assumes caller knows what it is doing %%
     if (force_result_type != NULL_TREE)
-        return vconvert(result, force_result_type);
+        return d_convert_basic(force_result_type, result);
 
     return result;
 }
                 tree args[3] = {
                     irs->integerConstant(elem_type->size(), Type::tsize_t),
                     irs->toDArray(e2),
-                    irs->toDArray(e1) };
+                    irs->toDArray(e1)
+                };
                 return irs->libCall(LIBCALL_ARRAYCOPY, 3, args, type->toCtype());
             }
             else
         if (irs->arrayBoundsCheck())
         {
             t = save_expr(t);
-            t = build3(COND_EXPR, TREE_TYPE(t), t, t,
+            t = build3(COND_EXPR, TREE_TYPE(t), d_truthvalue_conversion(t), t,
                        irs->assertCall(loc, LIBCALL_ARRAY_BOUNDS));
         }
         return irs->indirect(t, type->toCtype());