OpenJDK / jdk / jdk
changeset 59940:f2b42b50b505
8203005: The top-of-stack type specified for nofast_* bytecodes are wrong
Summary: The change was left by 8074345 the types were wrongly put as T_ILLEGAL for T_OBJECT, and T_ILLEGAL for T_INT.
Reviewed-by: dcubed, cjplummer
| author | minqi |
|---|---|
| date | Thu, 25 Jun 2020 12:40:02 -0700 |
| parents | 6c730060e94e |
| children | 315169f1f73a |
| files | src/hotspot/share/interpreter/bytecodes.cpp src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/interpreter/bytecodes.cpp Thu Jun 25 18:58:14 2020 +0200 +++ b/src/hotspot/share/interpreter/bytecodes.cpp Thu Jun 25 12:40:02 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -532,8 +532,8 @@ def(_nofast_getfield , "nofast_getfield" , "bJJ" , NULL , T_ILLEGAL, 0, true, _getfield ); def(_nofast_putfield , "nofast_putfield" , "bJJ" , NULL , T_ILLEGAL, -2, true , _putfield ); - def(_nofast_aload_0 , "nofast_aload_0" , "b" , NULL , T_ILLEGAL, 1, true , _aload_0 ); - def(_nofast_iload , "nofast_iload" , "bi" , NULL , T_ILLEGAL, 1, false, _iload ); + def(_nofast_aload_0 , "nofast_aload_0" , "b" , NULL , T_OBJECT, 1, true , _aload_0 ); + def(_nofast_iload , "nofast_iload" , "bi" , NULL , T_INT, 1, false, _iload ); def(_shouldnotreachhere , "_shouldnotreachhere" , "b" , NULL , T_VOID , 0, false);
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java Thu Jun 25 18:58:14 2020 +0200 +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java Thu Jun 25 12:40:02 2020 -0700 @@ -818,8 +818,8 @@ // CDS specific. Bytecodes rewritten at CDS dump time def(_nofast_getfield , "_nofast_getfield" , "bJJ" , null , BasicType.getTIllegal() , 0, true, _getfield ); def(_nofast_putfield , "_nofast_putfield" , "bJJ" , null , BasicType.getTIllegal() ,-2, true, _putfield ); - def(_nofast_aload_0 , "_nofast_aload_0" , "b" , null , BasicType.getTIllegal() , 1, true, _aload_0 ); - def(_nofast_iload , "_nofast_iload" , "bi" , null , BasicType.getTIllegal() , 1, false, _iload ); + def(_nofast_aload_0 , "_nofast_aload_0" , "b" , null , BasicType.getTObject() , 1, true, _aload_0 ); + def(_nofast_iload , "_nofast_iload" , "bi" , null , BasicType.getTInt() , 1, false, _iload ); def(_shouldnotreachhere , "_shouldnotreachhere" , "b" , null , BasicType.getTVoid() , 0, false);