From bc9009b9cd87d8c8a6684449d17543b10a18212b Mon Sep 17 00:00:00 2001 From: Sergey Nazarkin Date: Wed, 4 Aug 2021 15:53:29 +0300 Subject: [PATCH] Backport 302b8d06ce595b6071d728f6ab10dde561dcd54b --- src/hotspot/cpu/zero/stubGenerator_zero.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/zero/stubGenerator_zero.cpp b/src/hotspot/cpu/zero/stubGenerator_zero.cpp index 138da0b3a3d..a290eef2021 100644 --- a/src/hotspot/cpu/zero/stubGenerator_zero.cpp +++ b/src/hotspot/cpu/zero/stubGenerator_zero.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010, 2015 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -156,9 +156,11 @@ class StubGenerator: public StubCodeGenerator { StubRoutines::_oop_arraycopy = ShouldNotCallThisStub(); StubRoutines::_checkcast_arraycopy = ShouldNotCallThisStub(); - StubRoutines::_unsafe_arraycopy = ShouldNotCallThisStub(); StubRoutines::_generic_arraycopy = ShouldNotCallThisStub(); + // Shared code tests for "NULL" to discover the stub is not generated. + StubRoutines::_unsafe_arraycopy = NULL; + // We don't generate specialized code for HeapWord-aligned source // arrays, so just use the code we've already generated StubRoutines::_arrayof_jbyte_disjoint_arraycopy =