---

yaml
---
r: 39679
b: refs/heads/incoming
c: 6c18c75
h: refs/heads/master
i:
  39677: 5b76186
  39675: cc4c7c7
  39671: 2f5cb18
  39663: 82d0870
  39647: cccb807
  39615: ffe62f5
  39551: e179219
  39423: 1928368
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 3e7ab3a443a3c49d457226e7842a7256fe07933b
+refs/heads/incoming: 6c18c75f2d1d9c491f288724d355c11d3788d123
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/consts.rs

@@ -398,6 +398,7 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                 // forbids paths that don't map to C-like enum variants.
                 let ety = ty::expr_ty(cx.tcx, e);
                 let llty = type_of::type_of(cx, ety);
+                let llstructtys = lib::llvm::struct_element_types(llty);
 
                 // Can't use `discrims` from the crate context here because
                 // those discriminants have an extra level of indirection,
@@ -421,14 +422,8 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                         lldiscrim = found_lldiscrim;
                     }
                 }
-                let fields = if ty::enum_is_univariant(cx.tcx, enum_did) {
-                    ~[lldiscrim]
-                } else {
-                    let llstructtys = lib::llvm::struct_element_types(llty);
-                    ~[lldiscrim, C_null(llstructtys[1])]
-                };
 
-                C_named_struct(llty, fields)
+                C_named_struct(llty, ~[ lldiscrim, C_null(llstructtys[1]) ])
             }
             Some(ast::def_struct(_)) => {
                 let ety = ty::expr_ty(cx.tcx, e);

branches/incoming/src/rt/rust_upcall.cpp

@@ -158,8 +158,7 @@ upcall_s_exchange_malloc(s_exchange_malloc_args *args) {
     LOG_UPCALL_ENTRY(task);
 
     size_t total_size = get_box_size(args->size, args->td->align);
-    // FIXME--does this have to be calloc? (Issue #2682)
-    void *p = task->kernel->calloc(total_size, "exchange malloc");
+    void *p = task->kernel->malloc(total_size, "exchange malloc");
 
     rust_opaque_box *header = static_cast<rust_opaque_box*>(p);
     header->ref_count = -1; // This is not ref counted
@@ -234,8 +233,7 @@ upcall_s_malloc(s_malloc_args *args) {
     LOG_UPCALL_ENTRY(task);
     LOG(task, mem, "upcall malloc(0x%" PRIxPTR ")", args->td);
 
-    // FIXME--does this have to be calloc? (Issue #2682)
-    rust_opaque_box *box = task->boxed.calloc(args->td, args->size);
+    rust_opaque_box *box = task->boxed.malloc(args->td, args->size);
     void *body = box_body(box);
 
     debug::maybe_track_origin(task, box);