1.1 --- a/src/share/vm/shark/sharkState.cpp Mon Nov 26 17:25:11 2012 -0800
1.2 +++ b/src/share/vm/shark/sharkState.cpp Tue Nov 27 12:48:52 2012 -0800
1.3 @@ -131,7 +131,7 @@
1.4 Value *this_method = this->method();
1.5 Value *other_method = other->method();
1.6 if (this_method != other_method) {
1.7 - PHINode *phi = builder()->CreatePHI(SharkType::Method*_type(), "method");
1.8 + PHINode *phi = builder()->CreatePHI(SharkType::Method_type(), 0, "method");
1.9 phi->addIncoming(this_method, this_block);
1.10 phi->addIncoming(other_method, other_block);
1.11 set_method(phi);
1.12 @@ -142,7 +142,7 @@
1.13 Value *other_oop_tmp = other->oop_tmp();
1.14 if (this_oop_tmp != other_oop_tmp) {
1.15 assert(this_oop_tmp && other_oop_tmp, "can't merge NULL with non-NULL");
1.16 - PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), "oop_tmp");
1.17 + PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), 0, "oop_tmp");
1.18 phi->addIncoming(this_oop_tmp, this_block);
1.19 phi->addIncoming(other_oop_tmp, other_block);
1.20 set_oop_tmp(phi);
1.21 @@ -243,7 +243,7 @@
1.22 Value* method,
1.23 Value* osr_buf)
1.24 : SharkState(block) {
1.25 - assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack");
1.26 + assert(block->stack_depth_at_entry() == 0, "entry block shouldn't have stack");
1.27 set_num_monitors(block->ciblock()->monitor_count());
1.28
1.29 // Local variables
1.30 @@ -287,7 +287,7 @@
1.31 char name[18];
1.32
1.33 // Method
1.34 - set_method(builder()->CreatePHI(SharkType::Method*_type(), "method"));
1.35 + set_method(builder()->CreatePHI(SharkType::Method_type(), 0, "method"));
1.36
1.37 // Local variables
1.38 for (int i = 0; i < max_locals(); i++) {
1.39 @@ -307,7 +307,7 @@
1.40 case T_ARRAY:
1.41 snprintf(name, sizeof(name), "local_%d_", i);
1.42 value = SharkValue::create_phi(
1.43 - type, builder()->CreatePHI(SharkType::to_stackType(type), name));
1.44 + type, builder()->CreatePHI(SharkType::to_stackType(type), 0, name));
1.45 break;
1.46
1.47 case T_ADDRESS:
1.48 @@ -345,7 +345,7 @@
1.49 case T_ARRAY:
1.50 snprintf(name, sizeof(name), "stack_%d_", i);
1.51 value = SharkValue::create_phi(
1.52 - type, builder()->CreatePHI(SharkType::to_stackType(type), name));
1.53 + type, builder()->CreatePHI(SharkType::to_stackType(type), 0, name));
1.54 break;
1.55
1.56 case T_ADDRESS:
