comparison src/share/vm/interpreter/rewriter.cpp @ 4138:82af018d61db

Merge fixes.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 22:03:44 +0100
parents 04b9a2566eec
children 723df37192d6
comparison
equal deleted inserted replaced
4137:04b9a2566eec 4138:82af018d61db
289 #ifndef CC_INTERP 289 #ifndef CC_INTERP
290 (*bcp) = Bytecodes::_lookupswitch; 290 (*bcp) = Bytecodes::_lookupswitch;
291 #endif 291 #endif
292 break; 292 break;
293 } 293 }
294 case Bytecodes::_fast_linearswitch:
295 case Bytecodes::_fast_binaryswitch: {
296 #ifndef CC_INTERP
297 (*bcp) = Bytecodes::_lookupswitch;
298 #endif
299 break;
300 }
301 case Bytecodes::_getstatic : // fall through 294 case Bytecodes::_getstatic : // fall through
302 case Bytecodes::_putstatic : // fall through 295 case Bytecodes::_putstatic : // fall through
303 case Bytecodes::_getfield : // fall through 296 case Bytecodes::_getfield : // fall through
304 case Bytecodes::_putfield : // fall through 297 case Bytecodes::_putfield : // fall through
305 case Bytecodes::_invokevirtual : // fall through 298 case Bytecodes::_invokevirtual : // fall through