8023667: SA: ExceptionBlob and other C2 classes not available in client VM

Thu, 07 Sep 2017 10:15:21 -0400

author
dbuck
date
Thu, 07 Sep 2017 10:15:21 -0400
changeset 8896
c89173159237
parent 8895
8a06805fcf5d
child 8898
92693f9dd704
child 8907
9f401c01775b

8023667: SA: ExceptionBlob and other C2 classes not available in client VM
Summary: Ignore error of intialization of C2 only variables
Reviewed-by: sla, dholmes

agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js file | annotate | diff | comparison | revisions
     1.1 --- a/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Thu Sep 07 09:21:05 2017 -0400
     1.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Thu Sep 07 10:15:21 2017 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -804,6 +804,16 @@
    1.11  // VM type to SA class map
    1.12  var  vmType2Class = new Object();
    1.13  
    1.14 +// C2 only classes
    1.15 +try{
    1.16 +  vmType2Class["ExceptionBlob"] = sapkg.code.ExceptionBlob;
    1.17 +  vmType2Class["UncommonTrapBlob"] = sapkg.code.UncommonTrapBlob;
    1.18 +} catch(e) {
    1.19 +  // Ignore exception. C2 specific objects might be not 
    1.20 +  // available in client VM
    1.21 +}
    1.22 +
    1.23 +
    1.24  // This is *not* exhaustive. Add more if needed.
    1.25  // code blobs
    1.26  vmType2Class["BufferBlob"] = sapkg.code.BufferBlob;
    1.27 @@ -812,10 +822,8 @@
    1.28  vmType2Class["SafepointBlob"] = sapkg.code.SafepointBlob;
    1.29  vmType2Class["C2IAdapter"] = sapkg.code.C2IAdapter;
    1.30  vmType2Class["DeoptimizationBlob"] = sapkg.code.DeoptimizationBlob;
    1.31 -vmType2Class["ExceptionBlob"] = sapkg.code.ExceptionBlob;
    1.32  vmType2Class["I2CAdapter"] = sapkg.code.I2CAdapter;
    1.33  vmType2Class["OSRAdapter"] = sapkg.code.OSRAdapter;
    1.34 -vmType2Class["UncommonTrapBlob"] = sapkg.code.UncommonTrapBlob;
    1.35  vmType2Class["PCDesc"] = sapkg.code.PCDesc;
    1.36  
    1.37  // interpreter

mercurial