1.1 --- a/src/share/vm/shark/sharkIntrinsics.cpp Mon Nov 26 17:25:11 2012 -0800
1.2 +++ b/src/share/vm/shark/sharkIntrinsics.cpp Tue Nov 27 12:48:52 2012 -0800
1.3 @@ -171,7 +171,7 @@
1.4 builder()->CreateBr(done);
1.5
1.6 builder()->SetInsertPoint(done);
1.7 - PHINode *phi = builder()->CreatePHI(a->getType(), "result");
1.8 + PHINode *phi = builder()->CreatePHI(a->getType(), 0, "result");
1.9 phi->addIncoming(a, return_a);
1.10 phi->addIncoming(b, return_b);
1.11
1.12 @@ -210,7 +210,7 @@
1.13 Value *klass = builder()->CreateValueOfStructEntry(
1.14 state()->pop()->jobject_value(),
1.15 in_ByteSize(oopDesc::klass_offset_in_bytes()),
1.16 - SharkType::oop_type(),
1.17 + SharkType::klass_type(),
1.18 "klass");
1.19
1.20 state()->push(
1.21 @@ -265,8 +265,7 @@
1.22 "addr");
1.23
1.24 // Perform the operation
1.25 - Value *result = builder()->CreateCmpxchgInt(x, addr, e);
1.26 -
1.27 + Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent);
1.28 // Push the result
1.29 state()->push(
1.30 SharkValue::create_jint(
