You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2008/05/27 08:29:49 UTC
svn commit: r660402 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src:
optimizer/IRBuilder.cpp vm/VMInterface.h
Author: varlax
Date: Mon May 26 23:29:45 2008
New Revision: 660402
URL: http://svn.apache.org/viewvc?rev=660402&view=rev
Log:
postfix to HARMONY-5714:
- corrected assert;
- consistent handling of j.l.Class type
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp?rev=660402&r1=660401&r2=660402&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp Mon May 26 23:29:45 2008
@@ -2176,11 +2176,11 @@
Opnd*
IRBuilder::genGetClassObj(ObjectType* type) {
- assert(type->isClass() && (!type->isAbstract() || type->isArray()));
+ assert(type->isClass());
Opnd* dst = lookupHash(Op_GetClassObj, type->getId());
if (dst) return dst;
- Type* dstType = irManager->getCompilationInterface().findClassUsingBootstrapClassloader(JAVA_LANG_CLASS);
+ Type* dstType = irManager->getTypeManager().getSystemClassType();
dst = createOpnd(dstType);
appendInst(instFactory->makeGetClassObj(dst, type));
insertHash(Op_GetClassObj, type->getId(), dst->getInst());
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h?rev=660402&r1=660401&r2=660402&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h Mon May 26 23:29:45 2008
@@ -25,7 +25,6 @@
#include "open/em.h"
#include "open/ee_em_intf.h"
-#define JAVA_LANG_CLASS "java/lang/Class"
#define NULL_POINTER_EXCEPTION "java/lang/NullPointerException"
#define INDEX_OUT_OF_BOUNDS "java/lang/ArrayIndexOutOfBoundsException"
#define ARRAY_STORE_EXCEPTION "java/lang/ArrayStoreException"