*** old/src/share/vm/ci/ciEnv.cpp	Tue Nov 11 16:54:02 2008
--- new/src/share/vm/ci/ciEnv.cpp	Tue Nov 11 16:54:02 2008

*** 482,497 ****
--- 482,502 ----
    } else if (tag.is_float()) {
      return ciConstant((jfloat)cpool->float_at(index));
    } else if (tag.is_double()) {
      return ciConstant((jdouble)cpool->double_at(index));
    } else if (tag.is_string() || tag.is_unresolved_string()) {
!     oop string = cpool->string_at(index, THREAD);
!     oop string = NULL;
+     if (cpool->is_pseudo_string_at(index)) {
+       string = cpool->pseudo_string_at(index);
+     } else {
+       string = cpool->string_at(index, THREAD);
        if (HAS_PENDING_EXCEPTION) {
          CLEAR_PENDING_EXCEPTION;
          record_out_of_memory_failure();
          return ciConstant();
        }
+     }
      ciObject* constant = get_object(string);
      assert (constant->is_instance(), "must be an instance, or not? ");
      return ciConstant(T_OBJECT, constant);
    } else if (tag.is_klass() || tag.is_unresolved_klass()) {
      // 4881222: allow ldc to take a class type