---

yaml
---
r: 5175
b: refs/heads/master
c: 9946e46
h: refs/heads/master
i:
  5173: 08b6e95
  5171: 8a1dac4
  5167: b7069b4
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c047cfb710f3ea161b71cc4eb830275ec2c47eea
+refs/heads/master: 9946e467ff682820826fe14eae24b64418269b1f

trunk/src/comp/middle/trans.rs

@@ -5873,10 +5873,8 @@ fn trans_constant(ccx: @crate_ctxt, it: &@ast::item, pt: &[str],
                             {|buf|
                                 llvm::LLVMAddGlobal(ccx.llmod, T_int(), buf)
                             });
-            if n_variants != 1u {
-                llvm::LLVMSetInitializer(discrim_gvar, C_int(i as int));
-                llvm::LLVMSetGlobalConstant(discrim_gvar, True);
-            }
+            llvm::LLVMSetInitializer(discrim_gvar, C_int(i as int));
+            llvm::LLVMSetGlobalConstant(discrim_gvar, True);
             ccx.discrims.insert(variant.node.id, discrim_gvar);
             ccx.discrim_symbols.insert(variant.node.id, s);
             i += 1u;