Mercurial > hg > truffle
diff src/share/vm/runtime/frame.cpp @ 1692:d2ede61b7a12
6976186: integrate Shark HotSpot changes
Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure.
Reviewed-by: kvn, twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
author | twisti |
---|---|
date | Wed, 11 Aug 2010 05:51:21 -0700 |
parents | 126ea7725993 |
children | da877bdc9000 |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp Wed Aug 11 01:17:27 2010 -0700 +++ b/src/share/vm/runtime/frame.cpp Wed Aug 11 05:51:21 2010 -0700 @@ -1100,6 +1100,10 @@ oops_entry_do(f, map); } else if (CodeCache::contains(pc())) { oops_code_blob_do(f, cf, map); +#ifdef SHARK + } else if (is_fake_stub_frame()) { + // nothing to do +#endif // SHARK } else { ShouldNotReachHere(); }