# HG changeset patch
# User shade
# Date 1453999330 -10800
# Node ID 394a28cc103254238967026e2d2b5c765314a4b5
# Parent  54a4d0e9d96558074bef214c9eeda65a8438679a
8148483: JEP 280: Indify String Concatenation
Reviewed-by: psandoz, mcimadamore, igerasim, forax, plevart, vlivanov, ihse
Contributed-by: Aleksey Shipilev <aleksey.shipilev@oracle.com>, Remi Forax <forax@univ-mlv.fr>, Peter Levart <peter.levart@gmail.com>

diff -r 54a4d0e9d965 -r 394a28cc1032 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Thu Jan 28 07:59:44 2016 +0100
+++ b/make/CompileJavaModules.gmk	Thu Jan 28 19:42:10 2016 +0300
@@ -42,7 +42,7 @@
 
 ################################################################################
 
-java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
+java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
 java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
 java.base_CLEAN := intrinsic.properties
 
@@ -359,7 +359,7 @@
 
 ################################################################################
 
-jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*'
+jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' -XDstringConcat=inline
 jdk.compiler_COPY := javax.tools.JavaCompilerTool
 jdk.compiler_CLEAN_FILES := $(wildcard \
     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
diff -r 54a4d0e9d965 -r 394a28cc1032 make/common/SetupJavaCompilers.gmk
--- a/make/common/SetupJavaCompilers.gmk	Thu Jan 28 07:59:44 2016 +0100
+++ b/make/common/SetupJavaCompilers.gmk	Thu Jan 28 19:42:10 2016 +0300
@@ -55,7 +55,7 @@
 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
     JVM := $(JAVA_SMALL), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true \
+    FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
         $(DISABLE_WARNINGS) -Xlint:-options, \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))