# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1441618952 -7200
# Node ID 23db6926b163fbf0495d2cb0559326a123020ea2
# Parent  8750eddf726f79f378971fa8b6a0f2c2e8409255
Backed out d113a94d4fdd except for removing use of os::read

diff -r 8750eddf726f -r 23db6926b163 src/share/vm/jvmci/jvmciRuntime.cpp
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Fri Sep 04 17:02:03 2015 -0700
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Mon Sep 07 11:42:32 2015 +0200
@@ -865,9 +865,7 @@
     *sep = '\0';
     const char* name = line;
     char* value = sep + 1;
-    if(Arguments::PropertyList_get_value(*_plist, name) == NULL) {
-      Arguments::PropertyList_add(_plist, name, value);
-    }
+    Arguments::PropertyList_add(_plist, name, value);
   }
 };
 
diff -r 8750eddf726f -r 23db6926b163 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Fri Sep 04 17:02:03 2015 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Mon Sep 07 11:42:32 2015 +0200
@@ -212,6 +212,10 @@
 
   // Set OS specific system properties values
   os::init_system_properties_values();
+
+#if INCLUDE_JVMCI
+  JVMCIRuntime::parse_properties(&_system_properties);
+#endif
 }
 
 
diff -r 8750eddf726f -r 23db6926b163 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Fri Sep 04 17:02:03 2015 -0700
+++ b/src/share/vm/runtime/thread.cpp	Mon Sep 07 11:42:32 2015 +0200
@@ -3703,13 +3703,11 @@
   }
 
 #if INCLUDE_JVMCI
-  SystemProperty *properties = Arguments::system_properties();
-  JVMCIRuntime::parse_properties(&properties);
-  const char* jvmciCompiler = Arguments::PropertyList_get_value(properties, "jvmci.compiler");
+  const char* jvmciCompiler = Arguments::PropertyList_get_value(Arguments::system_properties(), "jvmci.compiler");
   if (jvmciCompiler != NULL) {
     JVMCIRuntime::save_compiler(jvmciCompiler);
   }
-  const char* jvmciOptions = Arguments::PropertyList_get_value(properties, "jvmci.options");
+  const char* jvmciOptions = Arguments::PropertyList_get_value(Arguments::system_properties(), "jvmci.options");
   if (jvmciOptions != NULL) {
     JVMCIRuntime::save_options(jvmciOptions);
   }