Mercurial > hg > truffle
changeset 9156:acadb114c818
8011648: C1: optimized build is broken after 7153771
Summary: missing #ifdef ASSERT
Reviewed-by: kvn
author | roland |
---|---|
date | Mon, 15 Apr 2013 17:17:11 +0200 |
parents | bb4a966cc68f |
children | 43223d3f5dcd b105029fdbfd |
files | src/share/vm/c1/c1_Canonicalizer.cpp src/share/vm/c1/c1_Canonicalizer.hpp src/share/vm/c1/c1_Instruction.hpp src/share/vm/c1/c1_InstructionPrinter.cpp src/share/vm/c1/c1_InstructionPrinter.hpp src/share/vm/c1/c1_LIR.cpp src/share/vm/c1/c1_LIR.hpp src/share/vm/c1/c1_LIRGenerator.cpp src/share/vm/c1/c1_LIRGenerator.hpp src/share/vm/c1/c1_Optimizer.cpp src/share/vm/c1/c1_RangeCheckElimination.hpp src/share/vm/c1/c1_ValueMap.hpp |
diffstat | 12 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Canonicalizer.cpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_Canonicalizer.cpp Mon Apr 15 17:17:11 2013 +0200 @@ -938,5 +938,7 @@ void Canonicalizer::do_ProfileInvoke(ProfileInvoke* x) {} void Canonicalizer::do_RuntimeCall(RuntimeCall* x) {} void Canonicalizer::do_RangeCheckPredicate(RangeCheckPredicate* x) {} +#ifdef ASSERT void Canonicalizer::do_Assert(Assert* x) {} +#endif void Canonicalizer::do_MemBar(MemBar* x) {}
--- a/src/share/vm/c1/c1_Canonicalizer.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_Canonicalizer.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -108,7 +108,9 @@ virtual void do_RuntimeCall (RuntimeCall* x); virtual void do_MemBar (MemBar* x); virtual void do_RangeCheckPredicate(RangeCheckPredicate* x); +#ifdef ASSERT virtual void do_Assert (Assert* x); +#endif }; #endif // SHARE_VM_C1_C1_CANONICALIZER_HPP
--- a/src/share/vm/c1/c1_Instruction.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_Instruction.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -111,7 +111,9 @@ class RuntimeCall; class MemBar; class RangeCheckPredicate; +#ifdef ASSERT class Assert; +#endif // A Value is a reference to the instruction creating the value typedef Instruction* Value;
--- a/src/share/vm/c1/c1_InstructionPrinter.cpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_InstructionPrinter.cpp Mon Apr 15 17:17:11 2013 +0200 @@ -871,12 +871,14 @@ } } +#ifdef ASSERT void InstructionPrinter::do_Assert(Assert* x) { output()->print("assert "); print_value(x->x()); output()->print(" %s ", cond_name(x->cond())); print_value(x->y()); } +#endif void InstructionPrinter::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) { print_unsafe_object_op(x, "UnsafePrefetchWrite");
--- a/src/share/vm/c1/c1_InstructionPrinter.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_InstructionPrinter.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -136,7 +136,9 @@ virtual void do_RuntimeCall (RuntimeCall* x); virtual void do_MemBar (MemBar* x); virtual void do_RangeCheckPredicate(RangeCheckPredicate* x); +#ifdef ASSERT virtual void do_Assert (Assert* x); +#endif }; #endif // PRODUCT
--- a/src/share/vm/c1/c1_LIR.cpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_LIR.cpp Mon Apr 15 17:17:11 2013 +0200 @@ -1778,7 +1778,9 @@ // LIR_OpProfileCall case lir_profile_call: s = "profile_call"; break; // LIR_OpAssert +#ifdef ASSERT case lir_assert: s = "assert"; break; +#endif case lir_none: ShouldNotReachHere();break; default: s = "illegal_op"; break; } @@ -2025,12 +2027,14 @@ out->print("[lbl:0x%x]", stub()->entry()); } +#ifdef ASSERT void LIR_OpAssert::print_instr(outputStream* out) const { print_condition(out, condition()); out->print(" "); in_opr1()->print(out); out->print(" "); in_opr2()->print(out); out->print(", \""); out->print(msg()); out->print("\""); } +#endif void LIR_OpDelay::print_instr(outputStream* out) const {
--- a/src/share/vm/c1/c1_LIR.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_LIR.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -881,8 +881,9 @@ class LIR_OpTypeCheck; class LIR_OpCompareAndSwap; class LIR_OpProfileCall; +#ifdef ASSERT class LIR_OpAssert; - +#endif // LIR operation codes enum LIR_Code { @@ -1139,7 +1140,9 @@ virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; } virtual LIR_OpCompareAndSwap* as_OpCompareAndSwap() { return NULL; } virtual LIR_OpProfileCall* as_OpProfileCall() { return NULL; } +#ifdef ASSERT virtual LIR_OpAssert* as_OpAssert() { return NULL; } +#endif virtual void verify() const {} };
--- a/src/share/vm/c1/c1_LIRGenerator.cpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp Mon Apr 15 17:17:11 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) {
--- a/src/share/vm/c1/c1_LIRGenerator.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_LIRGenerator.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -537,7 +537,9 @@ virtual void do_RuntimeCall (RuntimeCall* x); virtual void do_MemBar (MemBar* x); virtual void do_RangeCheckPredicate(RangeCheckPredicate* x); +#ifdef ASSERT virtual void do_Assert (Assert* x); +#endif };
--- a/src/share/vm/c1/c1_Optimizer.cpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_Optimizer.cpp Mon Apr 15 17:17:11 2013 +0200 @@ -535,7 +535,9 @@ void do_RuntimeCall (RuntimeCall* x); void do_MemBar (MemBar* x); void do_RangeCheckPredicate(RangeCheckPredicate* x); +#ifdef ASSERT void do_Assert (Assert* x); +#endif }; @@ -718,8 +720,9 @@ void NullCheckVisitor::do_RuntimeCall (RuntimeCall* x) {} void NullCheckVisitor::do_MemBar (MemBar* x) {} void NullCheckVisitor::do_RangeCheckPredicate(RangeCheckPredicate* x) {} +#ifdef ASSERT void NullCheckVisitor::do_Assert (Assert* x) {} - +#endif void NullCheckEliminator::visit(Value* p) { assert(*p != NULL, "should not find NULL instructions");
--- a/src/share/vm/c1/c1_RangeCheckElimination.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_RangeCheckElimination.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -166,7 +166,9 @@ void do_RuntimeCall (RuntimeCall* x) { /* nothing to do */ }; void do_MemBar (MemBar* x) { /* nothing to do */ }; void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ }; +#ifdef ASSERT void do_Assert (Assert* x) { /* nothing to do */ }; +#endif }; #ifdef ASSERT
--- a/src/share/vm/c1/c1_ValueMap.hpp Mon Apr 15 09:42:46 2013 +0200 +++ b/src/share/vm/c1/c1_ValueMap.hpp Mon Apr 15 17:17:11 2013 +0200 @@ -207,7 +207,9 @@ void do_RuntimeCall (RuntimeCall* x) { /* nothing to do */ }; void do_MemBar (MemBar* x) { /* nothing to do */ }; void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ }; +#ifdef ASSERT void do_Assert (Assert* x) { /* nothing to do */ }; +#endif };