Fix compiler for new DNode logic

enebo · enebo · commit 17ea7681901e · 2011-08-23T11:53:17.000-05:00
diff --git a/src/org/jruby/ast/DNode.java b/src/org/jruby/ast/DNode.java
@@ -45,10 +45,11 @@ public boolean isSameEncoding(StrNode strNode) {
     }
 
     protected RubyString allocateString(Ruby runtime) {
-        if (!is19()) return runtime.newString();
+        ByteList bytes = new ByteList();
         
-        // FIXME: Need a nicer constructor...          
-        return RubyString.newStringNoCopy(runtime, new ByteList(), encoding, StringSupport.CR_7BIT);
+        if (is19()) bytes.setEncoding(encoding);
+
+        return RubyString.newStringShared(runtime, bytes, StringSupport.CR_7BIT);
     }
 
     public void appendToString(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock, RubyString string, Node node) {
diff --git a/src/org/jruby/compiler/impl/BaseBodyCompiler.java b/src/org/jruby/compiler/impl/BaseBodyCompiler.java
@@ -450,19 +450,16 @@ public void createNewBignum(BigInteger value) {
 
     public void createNewString(ArrayCallback callback, int count, Encoding encoding) {
         loadRuntime();
-
-        method.newobj(p(ByteList.class));
-        method.dup();
-        method.ldc(StandardASMCompiler.STARTING_DSTR_SIZE);
-        method.invokespecial(p(ByteList.class), "<init>", sig(Void.TYPE, int.class));
+        ByteList startingDstr = new ByteList(StandardASMCompiler.STARTING_DSTR_SIZE);
 
         if (encoding != null) {
-            script.getCacheCompiler().cacheEncoding(this, encoding);
-            method.ldc(StringSupport.CR_7BIT);
-            method.invokestatic(p(RubyString.class), "newStringNoCopy", sig(RubyString.class, Ruby.class, ByteList.class, Encoding.class, int.class));
-        } else {
-            method.invokestatic(p(RubyString.class), "newStringLight", sig(RubyString.class, Ruby.class, ByteList.class));
+            startingDstr.setEncoding(encoding);
         }
+        
+        script.getCacheCompiler().cacheByteList(this, startingDstr);
+        method.invokevirtual(p(ByteList.class), "dup", sig(ByteList.class));
+        method.ldc(StringSupport.CR_7BIT);
+        method.invokestatic(p(RubyString.class), "newStringShared", sig(RubyString.class, Ruby.class, ByteList.class, int.class));
 
         for (int i = 0; i < count; i++) {
             callback.nextValue(this, null, i);

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,11 @@ public boolean isSameEncoding(StrNode strNode) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`protected RubyString allocateString(Ruby runtime) {`
`48`		`- if (!is19()) return runtime.newString();`
	`48`	`+ ByteList bytes = new ByteList();`
`49`	`49`
`50`		`- // FIXME: Need a nicer constructor...`
`51`		`- return RubyString.newStringNoCopy(runtime, new ByteList(), encoding, StringSupport.CR_7BIT);`
	`50`	`+ if (is19()) bytes.setEncoding(encoding);`
	`51`	`+`
	`52`	`+ return RubyString.newStringShared(runtime, bytes, StringSupport.CR_7BIT);`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`public void appendToString(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock, RubyString string, Node node) {`