# HG changeset patch
# User jcm
# Date 1509958170 -3600
# Node ID a11d9dbcd6c07d1063e80ddb1d82b4ff0d8e475e
# Parent  d099408b386e0a03c1c58de7cdef264ec6f7782a# Parent  499bba56e9386ed2e32b434fb8638437bdf0a70a
Merge

diff -r d099408b386e -r a11d9dbcd6c0 src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Mon Nov 06 00:30:36 2017 -0800
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Mon Nov 06 09:49:30 2017 +0100
@@ -538,7 +538,7 @@
         return result;
     }
 
-    synchronized HotSpotResolvedJavaField createField(JavaType type, long offset, int rawFlags, int index) {
+    HotSpotResolvedJavaField createField(JavaType type, long offset, int rawFlags, int index) {
         return new HotSpotResolvedJavaFieldImpl(this, type, offset, rawFlags, index);
     }