[vmkit-commits] [vmkit] r145513 - /vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc

[Will Dietz]

Author: wdietz2
Date: Wed Nov 30 13:38:17 2011
New Revision: 145513

URL: http://llvm.org/viewvc/llvm-project?rev=145513&view=rev
Log:
Fix ArrayCopy to (correctly) copy over null values.

Modified:
    vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc

Modified: vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc?rev=145513&r1=145512&r2=145513&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc Wed Nov 30 13:38:17 2011
@@ -68,11 +68,10 @@
         if (!(JavaObject::getClass(cur)->isAssignableFrom(dstType))) {
           th->throwException(vm->CreateArrayStoreException(
               (JavaVirtualTable*)dst->getVirtualTable()));
-          break;
-        } else {
-          ArrayObject::setElement((ArrayObject*)dst, cur, i + dstart);
+          UNREACHABLE();
         }
       }
+      ArrayObject::setElement((ArrayObject*)dst, cur, i + dstart);
     }
   } else {
     uint32 logSize = dstType->asPrimitiveClass()->logSize;