--- old/src/share/vm/compiler/compileBroker.cpp	2016-02-22 14:23:23.309377350 -0800
+++ new/src/share/vm/compiler/compileBroker.cpp	2016-02-22 14:23:23.181377348 -0800
@@ -1085,6 +1085,8 @@
   // some prerequisites that are compiler specific
   if (comp->is_c2() || comp->is_shark()) {
     method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NULL);
+  }
+  if (comp->is_shark()) {
     // Resolve all classes seen in the signature of the method
     // we are compiling.
     Method::load_signature_classes(method, CHECK_AND_CLEAR_NULL);