Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/ci/ciInstance.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/ci/ciInstance.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -49,9 +49,9 @@
    1.11    if (java_lang_Class::is_primitive(m)) {
    1.12      return ciType::make(java_lang_Class::primitive_type(m));
    1.13    } else {
    1.14 -    klassOop k = java_lang_Class::as_klassOop(m);
    1.15 +    Klass* k = java_lang_Class::as_Klass(m);
    1.16      assert(k != NULL, "");
    1.17 -    return CURRENT_THREAD_ENV->get_object(k)->as_klass();
    1.18 +    return CURRENT_THREAD_ENV->get_klass(k);
    1.19    }
    1.20  }
    1.21  
    1.22 @@ -142,5 +142,5 @@
    1.23  
    1.24  ciKlass* ciInstance::java_lang_Class_klass() {
    1.25    VM_ENTRY_MARK;
    1.26 -  return CURRENT_ENV->get_object(java_lang_Class::as_klassOop(get_oop()))->as_klass();
    1.27 +  return CURRENT_ENV->get_metadata(java_lang_Class::as_Klass(get_oop()))->as_klass();
    1.28  }