Skip to content
Permalink
Browse files
8247351: [aarch64] NullPointerException during stack walking (clhsdb …
…"where -a")

Reviewed-by: cjplummer
  • Loading branch information
nick-arm committed Jul 14, 2021
1 parent 589a1d5 commit 357fe09f2e46efa3343f6c8a57b8693dcd5dd43c
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -146,7 +146,7 @@ public Address getLocation(VMReg reg) {
Assert.that(0 <= i && i < regCount, "sanity check");
Assert.that(0 <= index && index < locationValidSize, "sanity check");
}
if ((locationValid[index] & (1 << i % locationValidTypeSize)) != 0) {
if ((locationValid[index] & (1L << i % locationValidTypeSize)) != 0) {
return location[i];
} else {
return getLocationPD(reg);
@@ -162,7 +162,7 @@ public void setLocation(VMReg reg, Address loc) {
Assert.that(updateMap, "updating map that does not need updating");
}
location[i] = loc;
locationValid[index] |= (1 << (i % locationValidTypeSize));
locationValid[index] |= (1L << (i % locationValidTypeSize));
}

public boolean getIncludeArgumentOops() {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2019, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -70,7 +70,7 @@
// Native frames
private static final int NATIVE_FRAME_INITIAL_PARAM_OFFSET = 2;

private static VMReg fp = new VMReg(29);
private static VMReg fp = new VMReg(29 << 1);

static {
VM.registerVMInitializedObserver(new Observer() {

1 comment on commit 357fe09

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 357fe09 Jul 14, 2021

Please sign in to comment.