# HG changeset patch
# User aleonard
# Date 1553611268 0
#      Tue Mar 26 14:41:08 2019 +0000
# Node ID 7b24ecfbf49499851a9182b7db4683ccffb967a1
# Parent  368757835b9788cf26904aa7445612ba3682ada4
8221430: StringBuffer(CharSequence) constructor truncates when -XX:-CompactStrings specified

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -96,15 +96,19 @@
      * the initial capacity equal to the smaller of (length + addition)
      * and Integer.MAX_VALUE.
      */
-    AbstractStringBuilder(byte coder, int length, int addition) {
+    AbstractStringBuilder(byte coderHint, int length, int addition) {
         if (length < 0) {
             throw new NegativeArraySizeException("Negative length: " + length);
         }
-        this.coder = coder;
         int capacity = (length < Integer.MAX_VALUE - addition)
                 ? length + addition : Integer.MAX_VALUE;
-        value = (coder == LATIN1)
-                ? new byte[capacity] : StringUTF16.newBytesFor(capacity);
+        if (COMPACT_STRINGS && coderHint == LATIN1) {
+            value = new byte[capacity];
+            coder = LATIN1;
+        } else {
+            value = StringUTF16.newBytesFor(capacity);
+            coder = UTF16;
+        }
     }
 
     /**
diff --git a/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java b/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java
--- a/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java
+++ b/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -440,6 +440,12 @@
               "abcdefgh1.23456");
         check(new StringBuffer().append(bmp).append(1.23456).toString(),
               "\u4e00\u4e01\u4e02\u4e03\u4e04\u4e05\u4e06\u4e07\u4e081.23456");
+
+        ////////////////////////////////////////////////////////////////////
+        check(new StringBuffer((CharSequence)new StringBuffer(ascii)).toString(),
+              ascii);
+        check(new StringBuffer((CharSequence)new StringBuffer(asciiMixed)).toString(),
+              asciiMixed);
     }
 
     private void checkGetChars(StringBuffer sb, int srcBegin, int srcEnd,