hotspot/src/share/vm/ci/ciEnv.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)ciEnv.cpp    1.128 07/05/17 15:49:53 JVM"
  #endif
  /*
!  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)ciEnv.cpp    1.128 07/05/17 15:49:53 JVM"
  #endif
  /*
!  * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 485,500 ****
    } 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);
      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
--- 485,505 ----
    } 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 = 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