# HG changeset patch
# User ehelin
# Date 1389107735 -3600
# Node ID 9982f3b7527bd53706c308f67684f3be0811c1eb
# Parent  d41bd7e90661bfafc639abe50d042a9728062ba6# Parent  d8d1b22b18098fb3d4cd3611cc6d18f55b3c125b
Merge

diff -r d41bd7e90661 -r 9982f3b7527b src/share/vm/classfile/javaClasses.cpp
--- a/src/share/vm/classfile/javaClasses.cpp	Tue Jan 07 13:31:33 2014 +0100
+++ b/src/share/vm/classfile/javaClasses.cpp	Tue Jan 07 16:15:35 2014 +0100
@@ -3286,7 +3286,7 @@
     sun_reflect_ConstantPool::compute_offsets();
     sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets();
   }
-  if (JDK_Version::is_jdk18x_version())
+  if (JDK_Version::is_gte_jdk18x_version())
     java_lang_reflect_Parameter::compute_offsets();
 
   // generated interpreter code wants to know about the offsets we just computed: