From 23b10ec6183d58fc1ab8f5b04ab69494571aa212 Mon Sep 17 00:00:00 2001 From: Xerxes Ranby Date: Thu, 28 Jul 2011 02:14:44 -0700 Subject: [PATCH] 7066143: JSR 292: Zero support after regressions from 7009923 and 7009309 Reviewed-by: jrose, twisti --- hotspot/src/cpu/zero/vm/stack_zero.cpp | 5 +++-- hotspot/src/share/vm/runtime/vmStructs.cpp | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hotspot/src/cpu/zero/vm/stack_zero.cpp b/hotspot/src/cpu/zero/vm/stack_zero.cpp index f1b31cc95ae..33b0551b539 100644 --- a/hotspot/src/cpu/zero/vm/stack_zero.cpp +++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp @@ -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 @@ void ZeroStack::handle_overflow(TRAPS) { break; case _thread_in_vm: - Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__); + Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__, + methodHandle()); break; default: diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp index 6924e47c4a5..d1cb2cc7dbd 100644 --- a/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp @@ -1281,7 +1281,6 @@ static inline uint64_t cast_uint64_t(size_t x) \ declare_toplevel_type(StubQueue) \ declare_toplevel_type(StubRoutines) \ - IA32_ONLY(declare_toplevel_type(StubRoutines::x86)) \ declare_toplevel_type(Stub) \ declare_type(InterpreterCodelet, Stub) \ \