Mercurial > hg > truffle
comparison src/share/vm/code/codeBlob.cpp @ 7226:8a3efb8c831d
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Fri, 14 Dec 2012 13:02:49 +0100 |
| parents | 5d0bb7d52783 |
| children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
| 7225:31c4d9f9e922 | 7226:8a3efb8c831d |
|---|---|
| 382 : SingletonBlob("DeoptimizationBlob", cb, sizeof(DeoptimizationBlob), size, frame_size, oop_maps) | 382 : SingletonBlob("DeoptimizationBlob", cb, sizeof(DeoptimizationBlob), size, frame_size, oop_maps) |
| 383 { | 383 { |
| 384 _unpack_offset = unpack_offset; | 384 _unpack_offset = unpack_offset; |
| 385 _unpack_with_exception = unpack_with_exception_offset; | 385 _unpack_with_exception = unpack_with_exception_offset; |
| 386 _unpack_with_reexecution = unpack_with_reexecution_offset; | 386 _unpack_with_reexecution = unpack_with_reexecution_offset; |
| 387 #if defined(COMPILER1) || defined(GRAAL) | |
| 388 _unpack_with_exception_in_tls = -1; | 387 _unpack_with_exception_in_tls = -1; |
| 389 #endif | |
| 390 } | 388 } |
| 391 | 389 |
| 392 | 390 |
| 393 DeoptimizationBlob* DeoptimizationBlob::create( | 391 DeoptimizationBlob* DeoptimizationBlob::create( |
| 394 CodeBuffer* cb, | 392 CodeBuffer* cb, |