Skip to content

Commit

Permalink
8247351: [aarch64] NullPointerException during stack walking (clhsdb …
Browse files Browse the repository at this point in the history 
…"where -a")

Reviewed-by: cjplummer
  • Loading branch information
@nick-arm
nick-arm committed Jul 14, 2021
1 parent 589a1d5 commit 357fe09
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java
View file
@@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java
View file
@@ -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.
*
Expand Down Expand Up @@ -70,7 +70,7 @@ public class AARCH64Frame extends Frame {
// 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() {
Expand Down

3 comments on commit 357fe09

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 357fe09 Sep 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 357fe09 Sep 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-357fe09f in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 357fe09f from the openjdk/jdk repository.

The commit being backported was authored by Nick Gasson on 14 Jul 2021 and was reviewed by Chris Plummer.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-357fe09f:GoeLin-backport-357fe09f
$ git checkout GoeLin-backport-357fe09f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-357fe09f

Please sign in to comment.