Need a volunteer to push C++11 macro fix to jdk9/hs-rt

bill pittore bill.pittore at oracle.com
Wed Jun 24 15:50:22 UTC 2015


This is bug 8081202 which fixes "C++11 requires a space between literal 
and identifier"

There are two export files here:
/export/users/bpittore/jdk9-macro-2/8081202.hotspot.export
/export/users/bpittore/jdk9-macro-2/8081202.hotspot.closed.export

The parent repo is jdk9/hs-rt.

I made some new changes to two files during the merge of the files from 
the command line range checking changeset. Diffs are below.

Thanks!

bill

--- old/src/share/vm/runtime/globals.cpp 2015-06-24 11:23:48.142216822 -0400
+++ new/src/share/vm/runtime/globals.cpp 2015-06-24 11:23:47.514180257 -0400
@@ -1240,7 +1240,7 @@
          size_ranges += sizeof(CommandLineFlagRange*);
        }
      }
-    fprintf(stderr, "Size of %d ranges: "SIZE_FORMAT" bytes\n",
+    fprintf(stderr, "Size of %d ranges: " SIZE_FORMAT " bytes\n",
              CommandLineFlagRangeList::length(), size_ranges);
    }
    {
@@ -1270,7 +1270,7 @@
          size_constraints += sizeof(CommandLineFlagConstraint*);
        }
      }
-    fprintf(stderr, "Size of %d constraints: "SIZE_FORMAT" bytes\n",
+    fprintf(stderr, "Size of %d constraints: " SIZE_FORMAT " bytes\n",
              CommandLineFlagConstraintList::length(), size_constraints);
    }
  #endif // PRINT_RANGES_AND_CONSTRAINTS_SIZES
--- old/src/share/vm/runtime/commandLineFlagRangeList.cpp 2015-06-24 
11:23:50.034326981 -0400
+++ new/src/share/vm/runtime/commandLineFlagRangeList.cpp 2015-06-24 
11:23:49.462293677 -0400
@@ -84,7 +84,7 @@
    }

    void print(outputStream* st) {
-    st->print("[ "INTX_FORMAT_W(-25)" ... "INTX_FORMAT_W(25)" ]", _min, 
_max);
+    st->print("[ " INTX_FORMAT_W(-25) " ... " INTX_FORMAT_W(25) " ]", 
_min, _max);
    }
  };

@@ -140,7 +140,7 @@
    }

    void print(outputStream* st) {
-    st->print("[ "UINTX_FORMAT_W(-25)" ... "UINTX_FORMAT_W(25)" ]", 
_min, _max);
+    st->print("[ " UINTX_FORMAT_W(-25) " ... " UINTX_FORMAT_W(25) " ]", 
_min, _max);
    }
  };

@@ -196,7 +196,7 @@
    }

    void print(outputStream* st) {
-    st->print("[ "SIZE_FORMAT_W(-25)" ... "SIZE_FORMAT_W(25)" ]", _min, 
_max);
+    st->print("[ " SIZE_FORMAT_W(-25) " ... " SIZE_FORMAT_W(25) " ]", 
_min, _max);
    }
  };


More information about the hotspot-dev mailing list