diff options
| author | jrose <none@none> | 2011-04-09 21:16:12 -0700 |
|---|---|---|
| committer | jrose <none@none> | 2011-04-09 21:16:12 -0700 |
| commit | 3dba0c694c7215ccc865fe0f65352ba4ec5456e8 (patch) | |
| tree | 95db1c0e4a096f52bef193735e40130d97c3d7e9 /src/share/vm/utilities | |
| parent | 9163142be698cffba17b791f0daaf5208567b9ba (diff) | |
| parent | 80a1479a9e8ca81e5406e4b030a9433d05419cf9 (diff) | |
Merge
Diffstat (limited to 'src/share/vm/utilities')
| -rw-r--r-- | src/share/vm/utilities/constantTag.cpp | 2 | ||||
| -rw-r--r-- | src/share/vm/utilities/constantTag.hpp | 3 | ||||
| -rw-r--r-- | src/share/vm/utilities/globalDefinitions.hpp | 6 | ||||
| -rw-r--r-- | src/share/vm/utilities/globalDefinitions_gcc.hpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/share/vm/utilities/constantTag.cpp b/src/share/vm/utilities/constantTag.cpp index 0d2744666..49e374e89 100644 --- a/src/share/vm/utilities/constantTag.cpp +++ b/src/share/vm/utilities/constantTag.cpp @@ -93,8 +93,6 @@ const char* constantTag::internal_name() const { return "MethodType"; case JVM_CONSTANT_InvokeDynamic : return "InvokeDynamic"; - case JVM_CONSTANT_InvokeDynamicTrans : - return "InvokeDynamic/transitional"; case JVM_CONSTANT_Object : return "Object"; case JVM_CONSTANT_Utf8 : diff --git a/src/share/vm/utilities/constantTag.hpp b/src/share/vm/utilities/constantTag.hpp index 43f5a8218..bbd02462e 100644 --- a/src/share/vm/utilities/constantTag.hpp +++ b/src/share/vm/utilities/constantTag.hpp @@ -86,8 +86,7 @@ class constantTag VALUE_OBJ_CLASS_SPEC { bool is_method_type() const { return _tag == JVM_CONSTANT_MethodType; } bool is_method_handle() const { return _tag == JVM_CONSTANT_MethodHandle; } - bool is_invoke_dynamic() const { return (_tag == JVM_CONSTANT_InvokeDynamic || - _tag == JVM_CONSTANT_InvokeDynamicTrans); } + bool is_invoke_dynamic() const { return _tag == JVM_CONSTANT_InvokeDynamic; } bool is_loadable_constant() const { return ((_tag >= JVM_CONSTANT_Integer && _tag <= JVM_CONSTANT_String) || diff --git a/src/share/vm/utilities/globalDefinitions.hpp b/src/share/vm/utilities/globalDefinitions.hpp index a742d2214..8607a3e03 100644 --- a/src/share/vm/utilities/globalDefinitions.hpp +++ b/src/share/vm/utilities/globalDefinitions.hpp @@ -746,9 +746,9 @@ enum CompLevel { CompLevel_simple = 1, // C1 CompLevel_limited_profile = 2, // C1, invocation & backedge counters CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo - CompLevel_full_optimization = 4, // C2 + CompLevel_full_optimization = 4, // C2 or Shark -#if defined(COMPILER2) +#if defined(COMPILER2) || defined(SHARK) CompLevel_highest_tier = CompLevel_full_optimization, // pure C2 and tiered #elif defined(COMPILER1) CompLevel_highest_tier = CompLevel_simple, // pure C1 @@ -760,7 +760,7 @@ enum CompLevel { CompLevel_initial_compile = CompLevel_full_profile // tiered #elif defined(COMPILER1) CompLevel_initial_compile = CompLevel_simple // pure C1 -#elif defined(COMPILER2) +#elif defined(COMPILER2) || defined(SHARK) CompLevel_initial_compile = CompLevel_full_optimization // pure C2 #else CompLevel_initial_compile = CompLevel_none diff --git a/src/share/vm/utilities/globalDefinitions_gcc.hpp b/src/share/vm/utilities/globalDefinitions_gcc.hpp index 4ba099ace..ac7fdf878 100644 --- a/src/share/vm/utilities/globalDefinitions_gcc.hpp +++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp @@ -77,7 +77,9 @@ # endif #ifdef LINUX +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif // __STDC_LIMIT_MACROS #include <inttypes.h> #include <signal.h> #include <ucontext.h> |