Skip to content

Commit

Permalink
More fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiHartmann committed Nov 7, 2024
1 parent bb3b87f commit 26818be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
1 change: 0 additions & 1 deletion src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, co
inline void FreezeBase::set_top_frame_metadata_pd(const frame& hf) {
stackChunkOop chunk = _cont.tail();
assert(chunk->is_in_chunk(hf.sp() - 1), "");
// TODO this does not work if the callee needs stack repair. But for interpreted callers, we just update the sp so that it fits :)
assert(chunk->is_in_chunk(hf.sp() - frame::sender_sp_offset), "");

address frame_pc = hf.pc();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,14 @@ public String toString() {

public void verify(String loc, int i) {
if (x1 != i || x2 != i) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
System.exit(1);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
}
}

public static void verify(SmallValue val, String loc, int i, boolean useNull) {
if (useNull) {
if (val != null) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
}
} else {
val.verify(loc, i);
Expand Down Expand Up @@ -160,15 +159,14 @@ public String toString() {
public void verify(String loc, int i) {
if (x1 != i || x2 != i || x3 != i || x4 != i || x5 != i ||
x6 != i || x7 != i) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
System.exit(1);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
}
}

public static void verify(LargeValue val, String loc, int i, boolean useNull) {
if (useNull) {
if (val != null) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
}
} else {
val.verify(loc, i);
Expand Down Expand Up @@ -202,15 +200,14 @@ public String toString() {
public void verify(String loc, int i) {
if (x1 != (byte)i || x2 != (short)i || x3 != i || x4 != i || x5 != i ||
x6 != ((i % 2) == 0)) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
System.exit(1);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
}
}

public static void verify(LargeValue2 val, String loc, int i, boolean useNull) {
if (useNull) {
if (val != null) {
new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
}
} else {
val.verify(loc, i);
Expand Down Expand Up @@ -240,15 +237,14 @@ public String toString() {

public void verify(String loc, Object obj) {
if (x1 != obj || x2 != obj || x3 != obj || x4 != obj || x5 != obj) {
new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + this).printStackTrace(System.out);
System.exit(1);
throw new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + this);
}
}

public static void verify(LargeValueWithOops val, String loc, Object obj, boolean useNull) {
if (useNull) {
if (val != null) {
new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + val).printStackTrace(System.out);
throw new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + val);
}
} else {
val.verify(loc, obj);
Expand Down

0 comments on commit 26818be

Please sign in to comment.