[llvm-commits] CVS: llvm-java/runtime/runtime.c

[Alkis Evlogimenos]

Changes in directory llvm-java/runtime:

runtime.c updated: 1.22 -> 1.23
---
Log message:

Always use memmove when copying arrays.


---
Diffs of the changes:  (+1 -6)

 runtime.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)


Index: llvm-java/runtime/runtime.c
diff -u llvm-java/runtime/runtime.c:1.22 llvm-java/runtime/runtime.c:1.23
--- llvm-java/runtime/runtime.c:1.22	Fri Mar 25 20:40:48 2005
+++ llvm-java/runtime/runtime.c	Mon Mar 28 13:19:27 2005
@@ -380,12 +380,7 @@
   src += srcStart * srcObj->vtable->typeinfo.elementSize;
   dst += dstStart * dstObj->vtable->typeinfo.elementSize;
 
-  // If arrays do not overlap use memcpy.
-  if ((dst > src ? dst - src : src - dst) > nbytes)
-    memcpy(dst, src, nbytes);
-  // If arrays overlap use memmove.
-  else
-    memmove(dst, src, nbytes);
+  memmove(dst, src, nbytes);
 }
 
 void Java_gnu_classpath_VMSystemProperties_preInit(JNIEnv *env, jobject clazz,