Mercurial > hg > truffle

changeset 3591:29d302af9207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust after RiResolvedType changes.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 17 Oct 2011 22:41:00 +0200
parents b2015b970785
children ff472e09af46
files src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalJavaAccess.hpp
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp	Mon Oct 17 20:41:50 2011 +0200
+++ b/src/share/vm/graal/graalCompiler.cpp	Mon Oct 17 22:41:00 2011 +0200
@@ -197,10 +197,8 @@
 
   if (klass->oop_is_javaArray()) {
     HotSpotTypeResolved::set_isArrayClass(obj, true);
-    HotSpotTypeResolved::set_componentType(obj, NULL);
   } else {
     HotSpotTypeResolved::set_isArrayClass(obj, false);
-    HotSpotTypeResolved::set_componentType(obj, NULL);
     HotSpotTypeResolved::set_instanceSize(obj, instanceKlass::cast(klass())->size_helper() * HeapWordSize);
     HotSpotTypeResolved::set_hasFinalizer(obj, klass->has_finalizer());
   }
--- a/src/share/vm/graal/graalJavaAccess.hpp	Mon Oct 17 20:41:50 2011 +0200
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Mon Oct 17 22:41:00 2011 +0200
@@ -57,12 +57,11 @@
     boolean_field(HotSpotTypeResolved, isInstanceClass)                                 \
     boolean_field(HotSpotTypeResolved, isInterface)                                     \
     int_field(HotSpotTypeResolved, instanceSize)                                        \
-    oop_field(HotSpotTypeResolved, componentType, "Lcom/sun/cri/ri/RiType;")            \
   end_class                                                                             \
   start_class(HotSpotMethodResolved)                                                    \
     oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/max/graal/hotspot/Compiler;") \
     oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;")                        \
-    oop_field(HotSpotMethodResolved, holder, "Lcom/sun/cri/ri/RiType;")                 \
+    oop_field(HotSpotMethodResolved, holder, "Lcom/sun/cri/ri/RiResolvedType;")         \
     oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;")                  \
     int_field(HotSpotMethodResolved, codeSize)                                          \
     int_field(HotSpotMethodResolved, accessFlags)                                       \
@@ -103,8 +102,8 @@
     oop_field(CiAssumptions, list, "[Lcom/sun/cri/ci/CiAssumptions$Assumption;")        \
   end_class                                                                             \
   start_class(CiAssumptions_ConcreteSubtype)                                            \
-    oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/sun/cri/ri/RiType;")        \
-    oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/sun/cri/ri/RiType;")        \
+    oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/sun/cri/ri/RiResolvedType;")\
+    oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/sun/cri/ri/RiResolvedType;")\
   end_class                                                                             \
   start_class(CiAssumptions_ConcreteMethod)                                             \
     oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/sun/cri/ri/RiMethod;")       \
@@ -216,7 +215,7 @@
     int_field(RiTypeProfile, count)                                                     \
     int_field(RiTypeProfile, morphism)                                                  \
     oop_field(RiTypeProfile, probabilities, "[F")                                       \
-    oop_field(RiTypeProfile, types, "[Lcom/sun/cri/ri/RiType;")                         \
+    oop_field(RiTypeProfile, types, "[Lcom/sun/cri/ri/RiResolvedType;")                 \
   end_class                                                                             \
   /* end*/