8133625: src/share/vm/opto/compile.hpp:96: error: integer constant is too large for ‘long’ type
Summary: Wrap constant causing the failure into into CONST64(). Update comments.
Reviewed-by: kvn
--- a/hotspot/src/share/vm/opto/compile.hpp Wed Aug 19 10:14:04 2015 +0200
+++ b/hotspot/src/share/vm/opto/compile.hpp Wed Aug 19 11:59:00 2015 +0200
@@ -93,7 +93,7 @@
public:
void set_idx(node_idx_t idx) {
- _idx_clone_orig = _idx_clone_orig & 0xFFFFFFFF00000000 | idx;
+ _idx_clone_orig = _idx_clone_orig & CONST64(0xFFFFFFFF00000000) | idx;
}
node_idx_t idx() const { return (node_idx_t)(_idx_clone_orig & 0xFFFFFFFF); }
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Wed Aug 19 10:14:04 2015 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Wed Aug 19 11:59:00 2015 +0200
@@ -161,7 +161,7 @@
//----------------------------------------------------------------------------------------------------
-// Constant for jlong (specifying an long long canstant is C++ compiler specific)
+// Constant for jlong (specifying a long long constant is C++ compiler specific)
// Build a 64bit integer constant
#define CONST64(x) (x ## LL)
--- a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp Wed Aug 19 10:14:04 2015 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp Wed Aug 19 11:59:00 2015 +0200
@@ -178,7 +178,7 @@
//----------------------------------------------------------------------------------------------------
-// Constant for jlong (specifying an long long constant is C++ compiler specific)
+// Constant for jlong (specifying a long long constant is C++ compiler specific)
// Build a 64bit integer constant
#define CONST64(x) (x ## LL)
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Wed Aug 19 10:14:04 2015 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Wed Aug 19 11:59:00 2015 +0200
@@ -148,9 +148,9 @@
inline int g_isfinite(jdouble f) { return _finite(f); }
//----------------------------------------------------------------------------------------------------
-// Constant for jlong (specifying an long long constant is C++ compiler specific)
+// Constant for jlong (specifying a long long constant is C++ compiler specific)
-// Build a 64bit integer constant on with Visual C++
+// Build a 64bit integer constant with Visual C++
#define CONST64(x) (x ## i64)
#define UCONST64(x) (x ## ui64)
--- a/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp Wed Aug 19 10:14:04 2015 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp Wed Aug 19 11:59:00 2015 +0200
@@ -108,7 +108,7 @@
//----------------------------------------------------------------------------------------------------
-// Constant for jlong (specifying an long long canstant is C++ compiler specific)
+// Constant for jlong (specifying a long long constant is C++ compiler specific)
// Build a 64bit integer constant
#define CONST64(x) (x ## LL)