--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java	Thu Sep 10 16:25:43 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Sep 11 16:41:50 2015 +0200
@@ -475,7 +475,7 @@
 
         final long id = offset + ((long) flags << 32);
 
-        // (thomaswue) Must cache the fields, because the local load elimination only works if the
+        // Must cache the fields, because the local load elimination only works if the
         // objects from two field lookups are identical.
         if (fieldCache == null) {
             fieldCache = new HashMap<>(8);

--- a/src/share/vm/code/codeBlob.hpp	Thu Sep 10 16:25:43 2015 -0700
+++ b/src/share/vm/code/codeBlob.hpp	Fri Sep 11 16:41:50 2015 +0200
@@ -358,7 +358,7 @@
   int _unpack_with_exception_in_tls;
 
 #if INCLUDE_JVMCI
-  // (thomaswue) Offset when JVMCI calls uncommon_trap.
+  // Offset when JVMCI calls uncommon_trap.
   int _uncommon_trap_offset;
   int _implicit_exception_uncommon_trap_offset;
 #endif
@@ -417,7 +417,7 @@
   address unpack_with_exception_in_tls() const   { return code_begin() + _unpack_with_exception_in_tls; }
 
 #if INCLUDE_JVMCI
-  // (thomaswue) Offset when JVMCI calls uncommon_trap.
+  // Offset when JVMCI calls uncommon_trap.
   void set_uncommon_trap_offset(int offset) {
     _uncommon_trap_offset = offset;
     assert(contains(code_begin() + _uncommon_trap_offset), "must be PC inside codeblob");

--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Thu Sep 10 16:25:43 2015 -0700
+++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Fri Sep 11 16:41:50 2015 +0200
@@ -449,8 +449,8 @@
     _parameter_count = method->size_of_parameters();
     TRACE_jvmci_2("installing code for %s", method->name_and_sig_as_C_string());
   } else {
-    // Must be a HotSpotCompiledRuntimeStub
-    // TODO (ds) not sure if this is correct - only used in OopMap constructor for non-product builds
+    // Must be a HotSpotCompiledRuntimeStub.
+    // Only used in OopMap constructor for non-product builds
     _parameter_count = 0;
   }
   _sites_handle = JNIHandles::make_local(HotSpotCompiledCode::sites(compiled_code));

--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Sep 10 16:25:43 2015 -0700
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Fri Sep 11 16:41:50 2015 +0200
@@ -818,7 +818,7 @@
       }
     }
 
-    // We cannot use jvmciJavaAccess for this because we are currently in the
+    // We cannot use jvmciJavaClasses for this because we are currently in the
     // process of initializing that mechanism.
     TempNewSymbol field_name = SymbolTable::new_symbol("useJVMCIClassLoader", CHECK_ABORT);
     fieldDescriptor field_desc;

--- a/src/share/vm/runtime/deoptimization.cpp	Thu Sep 10 16:25:43 2015 -0700
+++ b/src/share/vm/runtime/deoptimization.cpp	Fri Sep 11 16:41:50 2015 +0200
@@ -1425,7 +1425,7 @@
 
   // We need to update the map if we have biased locking.
 #if INCLUDE_JVMCI
-  // (lstadler) JVMCI might need to get an exception from the stack, which in turn requires the register map to be valid
+  // JVMCI might need to get an exception from the stack, which in turn requires the register map to be valid
   RegisterMap reg_map(thread, true);
 #else
   RegisterMap reg_map(thread, UseBiasedLocking);