src/hotspot/share/ci/ciSignature.hpp

@@ -25,10 +25,11 @@
  #ifndef SHARE_CI_CISIGNATURE_HPP
  #define SHARE_CI_CISIGNATURE_HPP
  
  #include "ci/ciClassList.hpp"
  #include "ci/ciSymbol.hpp"
+ #include "ci/ciType.hpp"
  #include "interpreter/bytecodes.hpp"
  #include "utilities/globalDefinitions.hpp"
  #include "utilities/growableArray.hpp"
  
  // ciSignature

@@ -54,11 +55,11 @@
  public:
    ciSymbol* as_symbol() const                    { return _symbol; }
    ciKlass*  accessing_klass() const              { return _accessing_klass; }
  
    ciType*   return_type() const                  { return _return_type; }
-   ciType*   type_at(int index) const             { return _types.at(index); }
+   ciType*   type_at(int index) const             { return _types.at(index)->unwrap(); }
  
    int       size() const                         { return _size; }
    int       count() const                        { return _types.length(); }
  
    int       arg_size_for_bc(Bytecodes::Code bc)  { return size() + (Bytecodes::has_receiver(bc) ? 1 : 0); }