Skip to content

Commit 79faa19

Browse files
author
SendaoYan
committed
8231058: VerifyOops crashes with assert(_offset >= 0) failed: offset for non comment?
Offset method should only be called for comments. Backport-of: 6bc9833
1 parent dcc9701 commit 79faa19

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

src/hotspot/share/asm/codeBuffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ CodeString* CodeStrings::find(intptr_t offset) const {
11001100
// Convenience for add_comment.
11011101
CodeString* CodeStrings::find_last(intptr_t offset) const {
11021102
CodeString* a = _strings_last;
1103-
while (a != NULL && !a->is_comment() && a->offset() > offset) {
1103+
while (a != NULL && !(a->is_comment() && a->offset() == offset)) {
11041104
a = a->_prev;
11051105
}
11061106
return a;
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test
26+
* @bug 8231058
27+
* @requires vm.debug & (os.arch != "sparc") & (os.arch != "sparcv9")
28+
* @run main/othervm -XX:+VerifyOops TestVerifyOops
29+
*/
30+
31+
public class TestVerifyOops {
32+
33+
public static void main(String[] args) {
34+
System.out.println("Test passed");
35+
}
36+
}

0 commit comments

Comments
 (0)