comparison src/share/vm/code/compiledIC.cpp @ 4562:ef00461e29af

Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Fri, 10 Feb 2012 10:16:19 -0800
parents 723df37192d6
children 33df1aeaebbf
comparison
equal deleted inserted replaced
4561:35ca3ade314d 4562:ef00461e29af
527 527
528 NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); // creation also verifies the object 528 NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); // creation also verifies the object
529 NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); 529 NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
530 530
531 assert(method_holder->data() == 0 || method_holder->data() == (intptr_t)callee(), "a) MT-unsafe modification of inline cache"); 531 assert(method_holder->data() == 0 || method_holder->data() == (intptr_t)callee(), "a) MT-unsafe modification of inline cache");
532 assert(UseGraal || jump->jump_destination() == (address)-1 || jump->jump_destination() == entry, "b) MT-unsafe modification of inline cache"); 532 // XXX GRAAL : ??
533 #ifndef GRAAL
534 assert(jump->jump_destination() == (address)-1 || jump->jump_destination() == entry, "b) MT-unsafe modification of inline cache");
535 #endif
533 536
534 // Update stub 537 // Update stub
535 method_holder->set_data((intptr_t)callee()); 538 method_holder->set_data((intptr_t)callee());
536 jump->set_jump_destination(entry); 539 jump->set_jump_destination(entry);
537 540