[llvm-commits] CVS: llvm-java/lib/Compiler/VMClass.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

VMClass.cpp updated: 1.35 -> 1.36
---
Log message:

Compute class records for primitive classes as well.


---
Diffs of the changes:  (+6 -3)

 VMClass.cpp |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Index: llvm-java/lib/Compiler/VMClass.cpp
diff -u llvm-java/lib/Compiler/VMClass.cpp:1.35 llvm-java/lib/Compiler/VMClass.cpp:1.36
--- llvm-java/lib/Compiler/VMClass.cpp:1.35	Fri Apr  1 12:31:25 2005
+++ llvm-java/lib/Compiler/VMClass.cpp	Fri Apr  1 14:20:56 2005
@@ -116,6 +116,10 @@
 
 void VMClass::computeLayout()
 {
+  // The layout of primitive classes is already computed.
+  if (isPrimitive())
+    return;
+
   // If this is an interface, then its layout and type are the same as
   // java/lang/Object.
   if (isInterface()) {
@@ -362,9 +366,8 @@
 {
   // Primitive classes require no linking.
   if (isPrimitive())
-    return;
-
-  if (isArray()) {
+    ;
+  else if (isArray()) {
     superClasses_.reserve(1);
     superClasses_.push_back(resolver_->getClass("java/lang/Object"));