diff src/share/vm/runtime/vmStructs.cpp @ 13155:1dd9aa5a9ee5

Deoptimization reason for failed aliasing assumptions.
author Roland Schatz <roland.schatz@oracle.com>
date Mon, 25 Nov 2013 17:23:56 +0100
parents d61687130412
children f294b4ee2d47
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp	Mon Nov 25 17:19:29 2013 +0100
+++ b/src/share/vm/runtime/vmStructs.cpp	Mon Nov 25 17:23:56 2013 +0100
@@ -2196,7 +2196,8 @@
                          declare_preprocessor_constant,                   \
                          declare_c1_constant,                             \
                          declare_c2_constant,                             \
-                         declare_c2_preprocessor_constant)                \
+                         declare_c2_preprocessor_constant,                \
+                         declare_graal_constant)                          \
                                                                           \
   /******************/                                                    \
   /* Useful globals */                                                    \
@@ -2505,6 +2506,7 @@
   declare_constant(Deoptimization::Reason_age)                            \
   declare_constant(Deoptimization::Reason_predicate)                      \
   declare_constant(Deoptimization::Reason_loop_limit_check)               \
+  declare_graal_constant(Deoptimization::Reason_aliasing)                 \
   declare_constant(Deoptimization::Reason_LIMIT)                          \
   declare_constant(Deoptimization::Reason_RECORDED_LIMIT)                 \
                                                                           \
@@ -2867,6 +2869,13 @@
 # define GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY(name, value)
 #endif /* COMPILER1 */
 
+// Generate an int constant for a Graal build
+#ifdef GRAAL
+# define GENERATE_GRAAL_VM_INT_CONSTANT_ENTRY(name)  GENERATE_VM_INT_CONSTANT_ENTRY(name)
+#else
+# define GENERATE_GRAAL_VM_INT_CONSTANT_ENTRY(name)
+#endif
+
 //--------------------------------------------------------------------------------
 // VMLongConstantEntry macros
 //
@@ -3009,7 +3018,8 @@
                    GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
                    GENERATE_C1_VM_INT_CONSTANT_ENTRY,
                    GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                   GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                   GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
+                   GENERATE_GRAAL_VM_INT_CONSTANT_ENTRY)
 
 #if INCLUDE_ALL_GCS
   VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)