Mercurial > hg > truffle
diff src/share/vm/c1/c1_Optimizer.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | 15559220ce79 |
| children | 7bca37d28f32 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Optimizer.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/c1/c1_Optimizer.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -642,7 +642,7 @@ void NullCheckVisitor::do_NewTypeArray (NewTypeArray* x) { nce()->handle_NewArray(x); } void NullCheckVisitor::do_NewObjectArray (NewObjectArray* x) { nce()->handle_NewArray(x); } void NullCheckVisitor::do_NewMultiArray (NewMultiArray* x) { nce()->handle_NewArray(x); } -void NullCheckVisitor::do_CheckCast (CheckCast* x) {} +void NullCheckVisitor::do_CheckCast (CheckCast* x) { nce()->clear_last_explicit_null_check(); } void NullCheckVisitor::do_InstanceOf (InstanceOf* x) {} void NullCheckVisitor::do_MonitorEnter (MonitorEnter* x) { nce()->handle_AccessMonitor(x); } void NullCheckVisitor::do_MonitorExit (MonitorExit* x) { nce()->handle_AccessMonitor(x); }