stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8087183: Fix call to inline function is_oop in header debugInfo.hpp

Browse Source 
Reviewed-by: kvn, kbarrett, dholmes
This commit is contained in:
Goetz Lindenmaier 2015-06-11 10:50:27 +02:00
parent d62598136b
commit af8e2b97ae
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/share/vm/code/debugInfo.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,7 @@
#include "code/debugInfo.hpp" #include "code/debugInfo.hpp"
#include "code/debugInfoRec.hpp" #include "code/debugInfoRec.hpp"
#include "code/nmethod.hpp" #include "code/nmethod.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp" #include "runtime/handles.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
@ -47,6 +48,12 @@ void DebugInfoWriteStream::write_metadata(Metadata* h) {
write_int(recorder()->oop_recorder()->find_index(h)); write_int(recorder()->oop_recorder()->find_index(h));
} }
oop DebugInfoReadStream::read_oop() {
oop o = code()->oop_at(read_int());
assert(o->is_oop_or_null(), "oop only");
return o;
}
ScopeValue* DebugInfoReadStream::read_object_value() { ScopeValue* DebugInfoReadStream::read_object_value() {
int id = read_int(); int id = read_int();
#ifdef ASSERT #ifdef ASSERT

8
hotspot/src/share/vm/code/debugInfo.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -266,11 +266,7 @@ class DebugInfoReadStream : public CompressedReadStream {
} ; } ;
oop read_oop() { oop read_oop();
oop o = code()->oop_at(read_int());
assert(o == NULL || o->is_oop(), "oop only");
return o;
}
Method* read_method() { Method* read_method() {
Method* o = (Method*)(code()->metadata_at(read_int())); Method* o = (Method*)(code()->metadata_at(read_int()));
// is_metadata() is a faster check than is_metaspace_object() // is_metadata() is a faster check than is_metaspace_object()