Mercurial > hg > truffle
diff src/share/vm/c1/c1_LIRGenerator.cpp @ 9159:43223d3f5dcd
Merge with hsx/hotspot-comp
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 16 Apr 2013 17:39:46 +0200 |
parents | 89e4d67fdd2a acadb114c818 |
children | 836a62f43af9 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp Tue Apr 16 17:16:06 2013 +0200 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp Tue Apr 16 17:39:46 2013 +0200 @@ -3103,8 +3103,8 @@ } } +#ifdef ASSERT void LIRGenerator::do_Assert(Assert *x) { -#ifdef ASSERT ValueTag tag = x->x()->type()->tag(); If::Condition cond = x->cond(); @@ -3124,9 +3124,8 @@ LIR_Opr right = yin->result(); __ lir_assert(lir_cond(x->cond()), left, right, x->message(), true); +} #endif -} - void LIRGenerator::do_RangeCheckPredicate(RangeCheckPredicate *x) {