Fix an array cloning bug.

jnthn · Feb 28, 2013 · 4b14a9f · 4b14a9f
1 parent 1ca4a94
commit 4b14a9f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance.java b/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance.java
@@ -252,7 +252,8 @@ private void memmove(SixModelObject[] slots, long dest_start, long src_start, lo
     public SixModelObject clone(ThreadContext tc) {
 		try {
 			VMArrayInstance clone = (VMArrayInstance)this.clone();
-			clone.slots = this.slots.clone();
+			if (this.slots != null)
+				clone.slots = this.slots.clone();
 			return clone;
 		} catch (CloneNotSupportedException e) {
 			throw new RuntimeException(e);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_i.java b/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_i.java
@@ -257,7 +257,8 @@ private void memmove(long[] slots, long dest_start, long src_start, long l_n) {
     public SixModelObject clone(ThreadContext tc) {
 		try {
 			VMArrayInstance_i clone = (VMArrayInstance_i)this.clone();
-			clone.slots = this.slots.clone();
+			if (clone.slots != null)
+				clone.slots = this.slots.clone();
 			return clone;
 		} catch (CloneNotSupportedException e) {
 			throw new RuntimeException(e);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_n.java b/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_n.java
@@ -257,7 +257,8 @@ private void memmove(double[] slots, long dest_start, long src_start, long l_n)
     public SixModelObject clone(ThreadContext tc) {
 		try {
 			VMArrayInstance_n clone = (VMArrayInstance_n)this.clone();
-			clone.slots = this.slots.clone();
+			if (clone.slots != null)
+				clone.slots = this.slots.clone();
 			return clone;
 		} catch (CloneNotSupportedException e) {
 			throw new RuntimeException(e);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_s.java b/src/org/perl6/nqp/sixmodel/reprs/VMArrayInstance_s.java
@@ -257,7 +257,8 @@ private void memmove(String[] slots, long dest_start, long src_start, long l_n)
     public SixModelObject clone(ThreadContext tc) {
 		try {
 			VMArrayInstance_s clone = (VMArrayInstance_s)this.clone();
-			clone.slots = this.slots.clone();
+			if (clone.slots != null)
+				clone.slots = this.slots.clone();
 			return clone;
 		} catch (CloneNotSupportedException e) {
 			throw new RuntimeException(e);