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

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

VMClass.h updated: 1.16 -> 1.17
Resolver.h updated: 1.10 -> 1.11
---
Log message:

Fix isInterface() so that it doesn't return true for java/lang/Object.


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

 Resolver.h |    1 -
 VMClass.h  |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)


Index: llvm-java/lib/Compiler/VMClass.h
diff -u llvm-java/lib/Compiler/VMClass.h:1.16 llvm-java/lib/Compiler/VMClass.h:1.17
--- llvm-java/lib/Compiler/VMClass.h:1.16	Mon Mar 28 18:41:22 2005
+++ llvm-java/lib/Compiler/VMClass.h	Mon Mar 28 20:47:41 2005
@@ -18,13 +18,13 @@
 #include <llvm/Constant.h>
 #include <llvm/Module.h>
 #include <llvm/Type.h>
+#include <llvm/Java/ClassFile.h>
 #include <map>
 #include <string>
 #include <vector>
 
 namespace llvm { namespace Java {
 
-  class ClassFile;
   class Resolver;
 
   class VMClass {
@@ -83,7 +83,7 @@
     const VMClass* getComponentClass() const { return componentClass_; }
     bool isArray() const { return getComponentClass(); }
     bool isPrimitive() const { return getType() == getLayoutType(); }
-    bool isInterface() const { return classFile_ && !getSuperClass(); }
+    bool isInterface() const { return classFile_ && classFile_->isInterface(); }
     unsigned getInterfaceIndex() const { return interfaceIndex_; }
     int getFieldIndex(const std::string& name) const;
 


Index: llvm-java/lib/Compiler/Resolver.h
diff -u llvm-java/lib/Compiler/Resolver.h:1.10 llvm-java/lib/Compiler/Resolver.h:1.11
--- llvm-java/lib/Compiler/Resolver.h:1.10	Mon Mar 28 17:56:46 2005
+++ llvm-java/lib/Compiler/Resolver.h	Mon Mar 28 20:47:41 2005
@@ -17,7 +17,6 @@
 
 #include "VMClass.h"
 #include <llvm/Java/Bytecode.h>
-#include <llvm/Java/ClassFile.h>
 #include <llvm/Module.h>
 #include <llvm/Type.h>
 #include <map>