changeset 22316:fa57ba6dc917

Remove unused JVMCI types from vmSymbols.hpp
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 23 Jul 2015 15:05:22 -0700
parents 43b6f2fd05a1
children e02fa353e88c
files src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/jvmci/jvmciCompilerToVM.cpp
diffstat 3 files changed, 0 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp	Thu Jul 23 14:24:00 2015 -0700
+++ b/src/share/vm/classfile/systemDictionary.hpp	Thu Jul 23 15:05:22 2015 -0700
@@ -234,7 +234,6 @@
   JVMCI_ONLY(do_klass(code_Location_klass,                   jdk_internal_jvmci_code_Location,                               Jvmci)) \
   JVMCI_ONLY(do_klass(code_Register_klass,                   jdk_internal_jvmci_code_Register,                               Jvmci)) \
   JVMCI_ONLY(do_klass(RegisterValue_klass,                   jdk_internal_jvmci_code_RegisterValue,                          Jvmci)) \
-  JVMCI_ONLY(do_klass(RegisterCategory_klass,                jdk_internal_jvmci_code_Register_RegisterCategory,              Jvmci)) \
   JVMCI_ONLY(do_klass(StackSlot_klass,                       jdk_internal_jvmci_code_StackSlot,                              Jvmci)) \
   JVMCI_ONLY(do_klass(StackLockValue_klass,                  jdk_internal_jvmci_code_StackLockValue,                         Jvmci)) \
   JVMCI_ONLY(do_klass(VirtualObject_klass,                   jdk_internal_jvmci_code_VirtualObject,                          Jvmci)) \
@@ -246,8 +245,6 @@
   JVMCI_ONLY(do_klass(ExceptionHandler_klass,                jdk_internal_jvmci_meta_ExceptionHandler,                       Jvmci)) \
   JVMCI_ONLY(do_klass(Kind_klass,                            jdk_internal_jvmci_meta_Kind,                                   Jvmci)) \
   JVMCI_ONLY(do_klass(LIRKind_klass,                         jdk_internal_jvmci_meta_LIRKind,                                Jvmci)) \
-  JVMCI_ONLY(do_klass(JavaMethod_klass,                      jdk_internal_jvmci_meta_JavaMethod,                             Jvmci)) \
-  JVMCI_ONLY(do_klass(JavaType_klass,                        jdk_internal_jvmci_meta_JavaType,                               Jvmci)) \
   JVMCI_ONLY(do_klass(AbstractValue_klass,                   jdk_internal_jvmci_meta_AbstractValue,                          Jvmci)) \
 
   /*end*/
--- a/src/share/vm/classfile/vmSymbols.hpp	Thu Jul 23 14:24:00 2015 -0700
+++ b/src/share/vm/classfile/vmSymbols.hpp	Thu Jul 23 15:05:22 2015 -0700
@@ -319,8 +319,6 @@
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_RawConstant,                        "jdk/internal/jvmci/meta/RawConstant"))                             \
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_NullConstant,                       "jdk/internal/jvmci/meta/NullConstant"))                            \
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_ExceptionHandler,                   "jdk/internal/jvmci/meta/ExceptionHandler"))                        \
-  JVMCI_ONLY(template(jdk_internal_jvmci_meta_JavaMethod,                         "jdk/internal/jvmci/meta/JavaMethod"))                              \
-  JVMCI_ONLY(template(jdk_internal_jvmci_meta_JavaType,                           "jdk/internal/jvmci/meta/JavaType"))                                \
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_Kind,                               "jdk/internal/jvmci/meta/Kind"))                                    \
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_LIRKind,                            "jdk/internal/jvmci/meta/LIRKind"))                                 \
   JVMCI_ONLY(template(jdk_internal_jvmci_meta_AbstractValue,                      "jdk/internal/jvmci/meta/AbstractValue"))                           \
@@ -346,7 +344,6 @@
   JVMCI_ONLY(template(jdk_internal_jvmci_code_Location,                           "jdk/internal/jvmci/code/Location"))                                \
   JVMCI_ONLY(template(jdk_internal_jvmci_code_Register,                           "jdk/internal/jvmci/code/Register"))                                \
   JVMCI_ONLY(template(jdk_internal_jvmci_code_RegisterValue,                      "jdk/internal/jvmci/code/RegisterValue"))                           \
-  JVMCI_ONLY(template(jdk_internal_jvmci_code_Register_RegisterCategory,          "jdk/internal/jvmci/code/Register$RegisterCategory"))               \
   JVMCI_ONLY(template(jdk_internal_jvmci_code_StackSlot,                          "jdk/internal/jvmci/code/StackSlot"))                               \
   JVMCI_ONLY(template(jdk_internal_jvmci_code_StackLockValue,                     "jdk/internal/jvmci/code/StackLockValue"))                          \
   JVMCI_ONLY(template(jdk_internal_jvmci_code_VirtualObject,                      "jdk/internal/jvmci/code/VirtualObject"))                           \
--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Thu Jul 23 14:24:00 2015 -0700
+++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Thu Jul 23 15:05:22 2015 -0700
@@ -1039,9 +1039,6 @@
 #define CC (char*)  /*cast a literal from (const char*)*/
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
 
-#define TYPE                  "Ljdk/internal/jvmci/meta/JavaType;"
-#define METHOD                "Ljdk/internal/jvmci/meta/JavaMethod;"
-#define FIELD                 "Ljdk/internal/jvmci/meta/JavaField;"
 #define SPECULATION_LOG       "Ljdk/internal/jvmci/meta/SpeculationLog;"
 #define STRING                "Ljava/lang/String;"
 #define OBJECT                "Ljava/lang/Object;"