From: <pet...@us...> - 2007-04-30 10:42:54
|
Revision: 12135 http://svn.sourceforge.net/jikesrvm/?rev=12135&view=rev Author: peter_donald Date: 2007-04-30 03:42:51 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Remove impossible condition Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 10:36:56 UTC (rev 12134) +++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 10:42:51 UTC (rev 12135) @@ -68,10 +68,6 @@ } } - // At this point neither t1 or t2 is a primitive or word type - if (VM.VerifyAssertions) VM._assert(!t1.isWordType() && !t2.isWordType() && - !t1.isPrimitiveType() && !t2.isPrimitiveType()); - // Is either t1 or t2 null? Null is assignable to all types so the type of // the other operand is the most precise if (t1 == VM_TypeReference.NULL_TYPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-30 10:49:21
|
Revision: 12136 http://svn.sourceforge.net/jikesrvm/?rev=12136&view=rev Author: peter_donald Date: 2007-04-30 03:49:13 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Unboxed types now have a single method to test for so we may aswell use it. Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 10:42:51 UTC (rev 12135) +++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 10:49:13 UTC (rev 12136) @@ -90,14 +90,11 @@ // dimensionality if (t1.isPrimitiveType() || t2.isPrimitiveType()) { VM_TypeReference type = VM_TypeReference.JavaLangObject; - if (t1 == t2) { - // Kludge around the fact that we have two ways to name magic arrays - if (t1.isWordType() && t2.isWordType()) { + if (t1 == t2) { + //Unboxed types are wrapped in their own array objects + if (t1.isUnboxedType()) { arrayDimensions++; type = t1; - } else if (t1.isCodeType() && t2.isCodeType()) { - arrayDimensions++; - type = t1; } else { if (VM.VerifyAssertions) VM._assert(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-30 11:20:16
|
Revision: 12137 http://svn.sourceforge.net/jikesrvm/?rev=12137&view=rev Author: peter_donald Date: 2007-04-30 04:20:15 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Remove a few more redundet asserts but add back in documentation Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 10:49:13 UTC (rev 12136) +++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/OPT_ClassLoaderProxy.java 2007-04-30 11:20:15 UTC (rev 12137) @@ -67,6 +67,8 @@ return null; } } + + //Neither t1 nor t2 are primitive or unboxed types at this point // Is either t1 or t2 null? Null is assignable to all types so the type of // the other operand is the most precise @@ -109,12 +111,6 @@ // At this point neither t1 or t2 is a primitive or word type and either // one or the other maybe an array type - if (VM.VerifyAssertions) { - VM._assert(!t1.isWordType() && !t1.isPrimitiveType()); - if (t1.isArrayType()) VM._assert(!t2.isArrayType()); - VM._assert(!t2.isWordType() && !t2.isPrimitiveType()); - if (t2.isArrayType()) VM._assert(!t1.isArrayType()); - } // is this a case of arrays with different dimensionalities? if (t1.isArrayType() || t2.isArrayType()) { @@ -127,8 +123,7 @@ + type); return type; } - // they both must be class types. - if (VM.VerifyAssertions) VM._assert(t1.isClassType() && t2.isClassType()); + // At this point they both must be class types. // technique: push heritage of each type on a separate stack, // then find the highest point in the stack where they differ. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |