--- a/hotspot/src/share/vm/adlc/adlparse.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/adlc/adlparse.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3485,8 +3485,8 @@
   skipws();
   if (_curchar != ')') {
     // Parse primary, secondary, and tertiary opcodes, if provided.
-    if ( ((primary = get_ident_or_literal_constant("primary opcode")) == NULL) ) {
-        parse_err(SYNERR, "primary hex opcode expected at %c\n", _curchar);
+    if ( (primary = get_ident_or_literal_constant("primary opcode")) == NULL ) {
+          parse_err(SYNERR, "primary hex opcode expected at %c\n", _curchar);
         return NULL;
     }
     skipws();
@@ -3494,7 +3494,7 @@
       next_char();
       skipws();
       // Parse secondary opcode
-      if ( ((secondary = get_ident_or_literal_constant("secondary opcode")) == NULL) ) {
+      if ( (secondary = get_ident_or_literal_constant("secondary opcode")) == NULL ) {
         parse_err(SYNERR, "secondary hex opcode expected at %c\n", _curchar);
         return NULL;
       }
@@ -3503,7 +3503,7 @@
         next_char();
         skipws();
         // Parse tertiary opcode
-        if ( ((tertiary = get_ident_or_literal_constant("tertiary opcode")) == NULL) ) {
+        if ( (tertiary = get_ident_or_literal_constant("tertiary opcode")) == NULL ) {
           parse_err(SYNERR,"tertiary hex opcode expected at %c\n", _curchar);
           return NULL;
         }
@@ -4773,8 +4773,7 @@
   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
   }
@@ -4812,7 +4811,7 @@
   if( (first == '=') || (first == '!') || (first == '<') || (first == '>') ) {
     next_char();
     char second = *_ptr;          // the second character
-    if( (second == '=') ) {
+    if( second == '=' ) {
       next_char();
       char tmp  = *_ptr;
       *_ptr = '\0';               // NULL terminate