Mercurial > hg > graal-jvmci-8
changeset 3843:d17bd0b18663
7066143: JSR 292: Zero support after regressions from 7009923 and 7009309
Reviewed-by: jrose, twisti
Contributed-by: Xerxes Ranby <xerxes@zafena.se>
author | twisti |
---|---|
date | Thu, 28 Jul 2011 02:14:44 -0700 |
parents | c7b60b601eb4 |
children | ce3e1d4dc416 |
files | src/cpu/zero/vm/stack_zero.cpp src/share/vm/runtime/vmStructs.cpp |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/stack_zero.cpp Wed Jul 27 17:28:36 2011 -0700 +++ b/src/cpu/zero/vm/stack_zero.cpp Thu Jul 28 02:14:44 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -69,7 +69,8 @@ break; case _thread_in_vm: - Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__); + Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__, + methodHandle()); break; default:
--- a/src/share/vm/runtime/vmStructs.cpp Wed Jul 27 17:28:36 2011 -0700 +++ b/src/share/vm/runtime/vmStructs.cpp Thu Jul 28 02:14:44 2011 -0700 @@ -1281,7 +1281,6 @@ \ declare_toplevel_type(StubQueue) \ declare_toplevel_type(StubRoutines) \ - IA32_ONLY(declare_toplevel_type(StubRoutines::x86)) \ declare_toplevel_type(Stub) \ declare_type(InterpreterCodelet, Stub) \ \