8310126: C1: Missing receiver null check in Reference::get intrinsic
Reviewed-by: roland, shade
This commit is contained in:
parent
492d25c8df
commit
02aaab12e3
src/hotspot/share/c1
test/hotspot/jtreg/compiler/intrinsics
@ -1207,7 +1207,8 @@ void LIRGenerator::do_Reference_get(Intrinsic* x) {
|
||||
|
||||
LIR_Opr result = rlock_result(x, T_OBJECT);
|
||||
access_load_at(IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
|
||||
reference, LIR_OprFact::intConst(referent_offset), result);
|
||||
reference, LIR_OprFact::intConst(referent_offset), result,
|
||||
nullptr, info);
|
||||
}
|
||||
|
||||
// Example: clazz.isInstance(object)
|
||||
|
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* Copyright (c) 2023, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8310126
|
||||
* @summary Test that the Reference::get intrinsic works with a null argument.
|
||||
* @run main/othervm -XX:TieredStopAtLevel=1 -XX:CompileCommand=compileonly,*TestReferenceGetWithNull::test -Xbatch
|
||||
* compiler.intrinsics.TestReferenceGetWithNull
|
||||
*/
|
||||
|
||||
package compiler.intrinsics;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
|
||||
public class TestReferenceGetWithNull {
|
||||
|
||||
// Declare final such that static binding at the call site is possible
|
||||
static final class MyReference<T> extends WeakReference<T> {
|
||||
public MyReference(T referent) {
|
||||
super(referent);
|
||||
}
|
||||
}
|
||||
|
||||
static void test(MyReference r) {
|
||||
try {
|
||||
r.get();
|
||||
} catch (Exception e) {
|
||||
// Ignore
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
// Make sure MyReference is loaded
|
||||
MyReference<String[]> obj = new MyReference<>(args);
|
||||
// Trigger compilation
|
||||
for (int i = 0; i < 50_000; ++i) {
|
||||
test(null);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user