File openjdk-6-src-b20-suggest-parentheses.patch of Package java-1_6_0-openjdk
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -986,22 +986,22 @@ inline intx byte_size(void* from, void*
// This routine takes eight bytes:
inline u8 build_u8_from( u1 c1, u1 c2, u1 c3, u1 c4, u1 c5, u1 c6, u1 c7, u1 c8 ) {
- return ( u8(c1) << 56 ) & ( u8(0xff) << 56 )
- | ( u8(c2) << 48 ) & ( u8(0xff) << 48 )
- | ( u8(c3) << 40 ) & ( u8(0xff) << 40 )
- | ( u8(c4) << 32 ) & ( u8(0xff) << 32 )
- | ( u8(c5) << 24 ) & ( u8(0xff) << 24 )
- | ( u8(c6) << 16 ) & ( u8(0xff) << 16 )
- | ( u8(c7) << 8 ) & ( u8(0xff) << 8 )
- | ( u8(c8) << 0 ) & ( u8(0xff) << 0 );
+ return (( u8(c1) << 56 ) & ( u8(0xff) << 56 ))
+ | (( u8(c2) << 48 ) & ( u8(0xff) << 48 ))
+ | (( u8(c3) << 40 ) & ( u8(0xff) << 40 ))
+ | (( u8(c4) << 32 ) & ( u8(0xff) << 32 ))
+ | (( u8(c5) << 24 ) & ( u8(0xff) << 24 ))
+ | (( u8(c6) << 16 ) & ( u8(0xff) << 16 ))
+ | (( u8(c7) << 8 ) & ( u8(0xff) << 8 ))
+ | (( u8(c8) << 0 ) & ( u8(0xff) << 0 ));
}
// This routine takes four bytes:
inline u4 build_u4_from( u1 c1, u1 c2, u1 c3, u1 c4 ) {
- return ( u4(c1) << 24 ) & 0xff000000
- | ( u4(c2) << 16 ) & 0x00ff0000
- | ( u4(c3) << 8 ) & 0x0000ff00
- | ( u4(c4) << 0 ) & 0x000000ff;
+ return (( u4(c1) << 24 ) & 0xff000000)
+ | (( u4(c2) << 16 ) & 0x00ff0000)
+ | (( u4(c3) << 8 ) & 0x0000ff00)
+ | (( u4(c4) << 0 ) & 0x000000ff);
}
// And this one works if the four bytes are contiguous in memory:
@@ -1011,8 +1011,8 @@ inline u4 build_u4_from( u1* p ) {
// Ditto for two-byte ints:
inline u2 build_u2_from( u1 c1, u1 c2 ) {
- return u2(( u2(c1) << 8 ) & 0xff00
- | ( u2(c2) << 0 ) & 0x00ff);
+ return u2((( u2(c1) << 8 ) & 0xff00)
+ | (( u2(c2) << 0 ) & 0x00ff));
}
// And this one works if the two bytes are contiguous in memory:
@@ -1035,14 +1035,14 @@ inline jfloat build_float_from( u1* p )
// now (64-bit) longs
inline jlong build_long_from( u1 c1, u1 c2, u1 c3, u1 c4, u1 c5, u1 c6, u1 c7, u1 c8 ) {
- return ( jlong(c1) << 56 ) & ( jlong(0xff) << 56 )
- | ( jlong(c2) << 48 ) & ( jlong(0xff) << 48 )
- | ( jlong(c3) << 40 ) & ( jlong(0xff) << 40 )
- | ( jlong(c4) << 32 ) & ( jlong(0xff) << 32 )
- | ( jlong(c5) << 24 ) & ( jlong(0xff) << 24 )
- | ( jlong(c6) << 16 ) & ( jlong(0xff) << 16 )
- | ( jlong(c7) << 8 ) & ( jlong(0xff) << 8 )
- | ( jlong(c8) << 0 ) & ( jlong(0xff) << 0 );
+ return (( jlong(c1) << 56 ) & ( jlong(0xff) << 56 ))
+ | (( jlong(c2) << 48 ) & ( jlong(0xff) << 48 ))
+ | (( jlong(c3) << 40 ) & ( jlong(0xff) << 40 ))
+ | (( jlong(c4) << 32 ) & ( jlong(0xff) << 32 ))
+ | (( jlong(c5) << 24 ) & ( jlong(0xff) << 24 ))
+ | (( jlong(c6) << 16 ) & ( jlong(0xff) << 16 ))
+ | (( jlong(c7) << 8 ) & ( jlong(0xff) << 8 ))
+ | (( jlong(c8) << 0 ) & ( jlong(0xff) << 0 ));
}
inline jlong build_long_from( u1* p ) {
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
@@ -346,7 +346,7 @@ class NoRefDiscovery: StackObj {
bool _was_discovering_refs;
public:
NoRefDiscovery(ReferenceProcessor* rp) : _rp(rp) {
- if (_was_discovering_refs = _rp->discovery_enabled()) {
+ if ((_was_discovering_refs = _rp->discovery_enabled())) {
_rp->disable_discovery();
}
}
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -4278,8 +4278,8 @@ int ADLParser::get_int(void) {
skipws(); // Skip whitespace before identifier
start = end = _ptr; // Start points at first character
c = *end; // Grab character to test
- while ((c >= '0') && (c <= '9')
- || ((c == '-') && (end == start))) {
+ while (((c >= '0') && (c <= '9'))
+ || (((c == '-') && (end == start)))) {
end++; // Increment end pointer
c = *end; // Grab character to test
}