Skip to content

Commit 302b8d0

Browse files
committed
8226878: zero crashes after JDK-8191278
Reviewed-by: shade, jcm
1 parent 2ad9f11 commit 302b8d0

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/hotspot/cpu/zero/stubGenerator_zero.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2010, 2015 Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -156,9 +156,11 @@ class StubGenerator: public StubCodeGenerator {
156156
StubRoutines::_oop_arraycopy = ShouldNotCallThisStub();
157157

158158
StubRoutines::_checkcast_arraycopy = ShouldNotCallThisStub();
159-
StubRoutines::_unsafe_arraycopy = ShouldNotCallThisStub();
160159
StubRoutines::_generic_arraycopy = ShouldNotCallThisStub();
161160

161+
// Shared code tests for "NULL" to discover the stub is not generated.
162+
StubRoutines::_unsafe_arraycopy = NULL;
163+
162164
// We don't generate specialized code for HeapWord-aligned source
163165
// arrays, so just use the code we've already generated
164166
StubRoutines::_arrayof_jbyte_disjoint_arraycopy =

0 commit comments

Comments
 (0)