src/share/vm/shark/sharkValue.cpp

rev 3810 : [mq]: shark.patch

*** 231,241 ****
                                      BasicBlock*   this_block,
                                      const char*   name) {
    assert(type() == other->type(), "should be");
    assert(zero_checked() == other->zero_checked(), "should be");
  
!   PHINode *phi = builder->CreatePHI(SharkType::to_stackType(type()), name);
    phi->addIncoming(this->generic_value(), this_block);
    phi->addIncoming(other->generic_value(), other_block);
    return SharkValue::create_generic(type(), phi, zero_checked());
  }
  SharkValue* SharkAddressValue::merge(SharkBuilder* builder,
--- 231,241 ----
                                      BasicBlock*   this_block,
                                      const char*   name) {
    assert(type() == other->type(), "should be");
    assert(zero_checked() == other->zero_checked(), "should be");
  
!   PHINode *phi = builder->CreatePHI(SharkType::to_stackType(type()), 0, name);
    phi->addIncoming(this->generic_value(), this_block);
    phi->addIncoming(other->generic_value(), other_block);
    return SharkValue::create_generic(type(), phi, zero_checked());
  }
  SharkValue* SharkAddressValue::merge(SharkBuilder* builder,