Mercurial > hg > truffle

diff src/share/vm/c1/c1_ValueType.cpp @ 6725:da91efe96a93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
author coleenp
date Sat, 01 Sep 2012 13:25:18 -0400
parents 1d7922586cf6
children 8a02ca5e5576
line wrap: on
line diff
--- a/src/share/vm/c1/c1_ValueType.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/src/share/vm/c1/c1_ValueType.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. 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
@@ -85,22 +85,6 @@
 }
 
 
-
-jobject ObjectType::encoding() const {
-  assert(is_constant(), "must be");
-  return constant_value()->constant_encoding();
-}
-
-bool ObjectType::is_loaded() const {
-  assert(is_constant(), "must be");
-  return constant_value()->is_loaded();
-}
-
-ciObject* ObjectConstant::constant_value() const                   { return _value; }
-ciObject* ArrayConstant::constant_value() const                    { return _value; }
-ciObject* InstanceConstant::constant_value() const                 { return _value; }
-ciObject* ClassConstant::constant_value() const                    { return _value; }
-
 ciType* ObjectConstant::exact_type() const {
   ciObject* c = constant_value();
   return (c != NULL && !c->is_null_object()) ? c->klass() : NULL;
@@ -114,10 +98,28 @@
   return (c != NULL && !c->is_null_object()) ? c->klass() : NULL;
 }
 ciType* ClassConstant::exact_type() const {
-  ciObject* c = constant_value();
-  return (c != NULL && !c->is_null_object()) ? c->klass() : NULL;
+  return Compilation::current()->env()->Class_klass();
+}
+
+
+jobject ObjectType::encoding() const {
+  assert(is_constant(), "must be");
+  return constant_value()->constant_encoding();
 }
 
+bool ObjectType::is_loaded() const {
+  assert(is_constant(), "must be");
+  return constant_value()->is_loaded();
+}
+
+bool MetadataType::is_loaded() const {
+  assert(is_constant(), "must be");
+  return constant_value()->is_loaded();
+}
+
+ciObject* ObjectConstant::constant_value() const                   { return _value; }
+ciObject* ArrayConstant::constant_value() const                    { return _value; }
+ciObject* InstanceConstant::constant_value() const                 { return _value; }
 
 ValueType* as_ValueType(BasicType type) {
   switch (type) {