--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Aug 20 14:59:10 2015 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Aug 20 15:15:05 2015 +0200
@@ -758,6 +758,7 @@
  * The line must match the regular expression "[^=]+=.*". That is one or more
  * characters other than '=' followed by '=' followed by zero or more characters.
  * Everything before the '=' is the property name and everything after '=' is the value.
+ * Lines that start with '#' are treated as comments and ignored.
  * No special processing of whitespace or any escape characters is performed.
  * Also, no check is made whether an existing property is overridden.
  */
@@ -766,6 +767,10 @@
 public:
   JVMCIPropertiesFileClosure(SystemProperty** plist) : _plist(plist) {}
   void do_line(char* line) {
+    if (line[0] == '#') {
+      // skip comment
+      return;
+    }
     size_t len = strlen(line);
     char* sep = strchr(line, '=');
     if (sep == NULL) {