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

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.25 -> 1.26

---
Log message:

Change type of Object to sbyte* so that llvm-as can parse it.
Also change basic block names to bc<num> so that they can be parsed as well.


---
Diffs of the changes:  (+7 -7)

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.25 llvm-java/lib/Compiler/Compiler.cpp:1.26
--- llvm-java/lib/Compiler/Compiler.cpp:1.25	Tue May 25 14:39:29 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Tue May 25 15:03:14 2004
@@ -74,20 +74,20 @@
                    unsigned t, unsigned f) {
             if (!bc2bbMap_[t])
                 bc2bbMap_[t] =
-                    new BasicBlock("bb at bc" + utostr(t), &function_);
+                    new BasicBlock("bc" + utostr(t), &function_);
             if (!bc2bbMap_[f])
                 bc2bbMap_[f] =
-                    new BasicBlock("bb at bc" + utostr(f), &function_);
+                    new BasicBlock("bc" + utostr(f), &function_);
         }
 
         void do_ifcmp(unsigned bcI, JSetCC cc,
                       unsigned t, unsigned f) {
             if (!bc2bbMap_[t])
                 bc2bbMap_[t] =
-                    new BasicBlock("bb at bc" + utostr(t), &function_);
+                    new BasicBlock("bc" + utostr(t), &function_);
             if (!bc2bbMap_[f])
                 bc2bbMap_[f] =
-                    new BasicBlock("bb at bc" + utostr(f), &function_);
+                    new BasicBlock("bc" + utostr(f), &function_);
         }
 
         void do_switch(unsigned bcI,
@@ -97,11 +97,11 @@
                 unsigned target = sw[i].second;
                 if (!bc2bbMap_[target])
                     bc2bbMap_[target] =
-                        new BasicBlock("bb at bc" + utostr(target), &function_);
+                        new BasicBlock("bc" + utostr(target), &function_);
             }
             if (!bc2bbMap_[defTarget])
                 bc2bbMap_[defTarget] =
-                    new BasicBlock("bb at bc" + utostr(defTarget), &function_);
+                    new BasicBlock("bc" + utostr(defTarget), &function_);
         }
 
     private:
@@ -117,7 +117,7 @@
             switch (type) {
                 // FIXME: this should really be a non-void type when the object
                 // model is finalized
-            case REFERENCE: return PointerType::get(Type::VoidTy);
+            case REFERENCE: return PointerType::get(Type::SByteTy);
             case BOOLEAN: return Type::BoolTy;
             case CHAR: return Type::UByteTy;
             case FLOAT: return Type::FloatTy;