comparison src/share/vm/classfile/stackMapFrame.hpp @ 20527:8cb56c8cb30d

Merge
author jiangli
date Mon, 15 Sep 2014 16:39:00 -0400
parents b2daaf70fab2 c77d5db18942
children
comparison
equal deleted inserted replaced
20411:fe1f65b0a2d8 20527:8cb56c8cb30d
232 // is assignable to type. 232 // is assignable to type.
233 inline VerificationType pop_stack(VerificationType type, TRAPS) { 233 inline VerificationType pop_stack(VerificationType type, TRAPS) {
234 if (_stack_size != 0) { 234 if (_stack_size != 0) {
235 VerificationType top = _stack[_stack_size - 1]; 235 VerificationType top = _stack[_stack_size - 1];
236 bool subtype = type.is_assignable_from( 236 bool subtype = type.is_assignable_from(
237 top, verifier(), CHECK_(VerificationType::bogus_type())); 237 top, verifier(), false, CHECK_(VerificationType::bogus_type()));
238 if (subtype) { 238 if (subtype) {
239 --_stack_size; 239 --_stack_size;
240 return top; 240 return top;
241 } 241 }
242 } 242 }
247 VerificationType type1, VerificationType type2, TRAPS) { 247 VerificationType type1, VerificationType type2, TRAPS) {
248 assert(type1.is_long2() || type1.is_double2(), "must be long/double"); 248 assert(type1.is_long2() || type1.is_double2(), "must be long/double");
249 assert(type2.is_long() || type2.is_double(), "must be long/double_2"); 249 assert(type2.is_long() || type2.is_double(), "must be long/double_2");
250 if (_stack_size >= 2) { 250 if (_stack_size >= 2) {
251 VerificationType top1 = _stack[_stack_size - 1]; 251 VerificationType top1 = _stack[_stack_size - 1];
252 bool subtype1 = type1.is_assignable_from(top1, verifier(), CHECK); 252 bool subtype1 = type1.is_assignable_from(top1, verifier(), false, CHECK);
253 VerificationType top2 = _stack[_stack_size - 2]; 253 VerificationType top2 = _stack[_stack_size - 2];
254 bool subtype2 = type2.is_assignable_from(top2, verifier(), CHECK); 254 bool subtype2 = type2.is_assignable_from(top2, verifier(), false, CHECK);
255 if (subtype1 && subtype2) { 255 if (subtype1 && subtype2) {
256 _stack_size -= 2; 256 _stack_size -= 2;
257 return; 257 return;
258 } 258 }
259 } 259 }