# HG changeset patch # User goetz # Date 1434012627 -7200 # Node ID 75739eb06c95faa29cd6be4f6496c956c84d86a3 # Parent 758cc95296c16164f368ebb0c9b71e8eb7e590cf 8087183: Fix call to inline function is_oop in header debugInfo.hpp. diff --git a/src/share/vm/code/debugInfo.cpp b/src/share/vm/code/debugInfo.cpp --- a/src/share/vm/code/debugInfo.cpp +++ b/src/share/vm/code/debugInfo.cpp @@ -26,6 +26,7 @@ #include "code/debugInfo.hpp" #include "code/debugInfoRec.hpp" #include "code/nmethod.hpp" +#include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC @@ -47,6 +48,12 @@ write_int(recorder()->oop_recorder()->find_index(h)); } +oop DebugInfoReadStream::read_oop() { + oop o = code()->oop_at(read_int()); + assert(o == NULL || o->is_oop(), "oop only"); + return o; +} + ScopeValue* DebugInfoReadStream::read_object_value() { int id = read_int(); #ifdef ASSERT diff --git a/src/share/vm/code/debugInfo.hpp b/src/share/vm/code/debugInfo.hpp --- a/src/share/vm/code/debugInfo.hpp +++ b/src/share/vm/code/debugInfo.hpp @@ -266,11 +266,7 @@ } ; - oop read_oop() { - oop o = code()->oop_at(read_int()); - assert(o == NULL || o->is_oop(), "oop only"); - return o; - } + oop read_oop(); Method* read_method() { Method* o = (Method*)(code()->metadata_at(read_int())); // is_metadata() is a faster check than is_metaspace_object()