Merging master HEAD into openj9-staging

make/CompileCommands.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -45,11 +45,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-
  $(RM) $@
  $(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \
  $(SORT) | $(XARGS) $(CAT) >> $@.tmp
- $(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \
- tmpfile = substr(ARGV[2],2); \
- cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \
- system(cmd); \
- }' -- @$@.tmp)
  $(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@
  $(RM) $@.tmp
 

make/RunTestsPrebuiltSpec.gmk

@@ -153,7 +153,6 @@ LN := ln
 MIG := mig
 MKDIR := mkdir
 MV := mv
-NAWK := nawk
 NICE := nice
 PATCH := patch
 PRINTF := printf

make/autoconf/basic_tools.m4

@@ -57,7 +57,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_REQUIRE_PROGS(MKDIR, [gmkdir mkdir])
  UTIL_REQUIRE_PROGS(MKTEMP, mktemp)
  UTIL_REQUIRE_PROGS(MV, mv)
- UTIL_REQUIRE_PROGS(NAWK, [nawk gawk awk])
+ UTIL_REQUIRE_PROGS(AWK, [gawk nawk awk])
  UTIL_REQUIRE_PROGS(PRINTF, printf)
  UTIL_REQUIRE_PROGS(READLINK, [greadlink readlink])
  UTIL_REQUIRE_PROGS(RM, rm)
@@ -75,7 +75,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_REQUIRE_PROGS(XARGS, xargs)
 
  # Then required tools that require some special treatment.
- UTIL_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
  UTIL_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])

make/autoconf/compare.sh.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020, 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
@@ -53,7 +53,6 @@ export LDD="@LDD@"
 export LN="@LN@"
 export MKDIR="@MKDIR@"
 export MV="@MV@"
-export NAWK="@NAWK@"
 export NM="@GNM@"
 export OBJDUMP="@OBJDUMP@"
 export OTOOL="@OTOOL@"

make/autoconf/spec.gmk.in

@@ -707,7 +707,6 @@ LN:=@LN@
 MIG:=@MIG@
 MKDIR:=@MKDIR@
 MV:=@MV@
-NAWK:=@NAWK@
 NICE:=@NICE@
 PANDOC:=@FIXPATH@ @PANDOC@
 PATCH:=@PATCH@

make/common/MakeBase.gmk

@@ -89,18 +89,18 @@ BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
 
 # Record starting time for build of a sub repository.
 define RecordStartTime
- $(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
+ $(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
  $(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
 endef
 
 # Record ending time and calculate the difference and store it in a
 # easy to read format. Handles builds that cross midnight. Expects
 # that a build will never take 24 hours or more.
 define RecordEndTime
- $(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
+ $(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
  $(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
  $(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
- $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
+ $(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
  M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
  > $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
 endef
@@ -439,6 +439,8 @@ endif
 # This is normally not needed since we use the FIXPATH prefix for command lines,
 # but might be needed in certain circumstances.
 ifeq ($(call isTargetOs, windows), true)
+ FixPathArgs = \
+ $(shell $(FIXPATH) cmd /c echo $1)
  ifeq ($(call isBuildOsEnv, windows.wsl), true)
  FixPath = \
  $(shell $(WSLPATH) -m $1)
@@ -447,6 +449,8 @@ ifeq ($(call isTargetOs, windows), true)
  $(shell $(CYGPATH) -m $1)
  endif
 else
+ FixPathArgs = \
+ $1
  FixPath = \
  $1
 endif

make/common/Modules.gmk

@@ -338,7 +338,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
  $(RM) $@
  $(foreach m, $(MODULE_INFOS), \
  ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \
- $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+ $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
  BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
  /^ *requires/ { sub(/;/, ""); \
  sub(/requires /, " "); \
@@ -352,7 +352,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
  printf(" %s", $$0) } \
  END { printf("\n") }' $m && \
  $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
- $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+ $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
  BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
  /^ *requires *transitive/ { \
  sub(/;/, ""); \

make/common/NativeCompilation.gmk

@@ -76,10 +76,10 @@ define WriteCompileCommandsFragment
  $(call LogInfo, Creating compile commands fragment for $(notdir $3))
  $(call MakeDir, $(dir $1))
  $(call WriteFile,{ \
- "directory": "$(strip $2)"$(COMMA) \
- "file": "$(strip $3)"$(COMMA) \
+ "directory": "$(strip $(call FixPathArgs, $2))"$(COMMA) \
+ "file": "$(strip $(call FixPathArgs, $3))"$(COMMA) \
  "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\
- $(subst $(FIXPATH),,$4))))" \
+ $(subst $(FIXPATH),,$(call FixPathArgs, $4)))))" \
  }$(COMMA), \
  $1)
 endef
@@ -241,10 +241,15 @@ ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
  ) \
  )
 
- # When compiling with relative paths, the deps file comes out with relative
- # paths.
+ # When compiling with relative paths, the deps file may come out with relative
+ # paths, and that path may start with './'. First remove any leading ./, then
+ # add WORKSPACE_ROOT to any line not starting with /, while allowing for
+ # leading spaces.
  define fix-deps-file
- $(SED) -e 's|^\([ ]*\)|\1$(WORKSPACE_ROOT)|' $1.tmp > $1
+ $(SED) \
+ -e 's|^\([ ]*\)\./|\1|' \
+ -e '/^[ ]*[^/ ]/s|^\([ ]*\)|\1$(WORKSPACE_ROOT)/|' \
+ $1.tmp > $1
  endef
 else
  # By default the MakeCommandRelative macro does nothing.

make/common/TextFileProcessing.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020, 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
@@ -177,7 +177,7 @@ define SetupTextFileProcessingBody
  $1_INCLUDES_PARTIAL_AWK := $$(subst $$(SPACE);,,$$(subst $$(SPACE)=>$$(SPACE),"$$(RIGHT_PAREN)$$(RIGHT_PAREN) \
  { include$$(LEFT_PAREN)",$$(subst $$(SPACE);$$(SPACE),"$$(RIGHT_PAREN) } \
  else if $$(LEFT_PAREN)matches$$(LEFT_PAREN)",$$(strip $$($1_INCLUDES)))))
- $1_INCLUDES_COMMAND_LINE := $(NAWK) '$$($1_INCLUDES_HEADER_AWK) \
+ $1_INCLUDES_COMMAND_LINE := $(AWK) '$$($1_INCLUDES_HEADER_AWK) \
  { if (matches("$$($1_INCLUDES_PARTIAL_AWK)") } else print }'
  else
  # We don't have any includes, just pipe the file through cat.

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -168,7 +168,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
  $(SINGLE_AD_SRCFILE): $(AD_SRC_FILES)
  $(call LogInfo, Preprocessing adlc files $(^F))
  $(call MakeDir, $(@D))
- $(NAWK) $(INSERT_FILENAME_AWK_SCRIPT) $^ > $@
+ $(AWK) $(INSERT_FILENAME_AWK_SCRIPT) $^ > $@
 
  ##############################################################################
  # Run the adlc tool on the single concatenated ad source file, and store the
@@ -205,7 +205,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
  $(JVM_VARIANT_OUTPUTDIR)/gensrc/adfiles/%: $(adlc_run_TARGET)
  $(call LogInfo, Postprocessing adlc file $*)
  $(call MakeDir, $(@D))
- $(NAWK) \
+ $(AWK) \
  'BEGIN { print "#line 1 \"$*\""; } \
  /^#line 999999$$/ {print "#line " (NR+1) " \"$*\""; next} \
  $(if $(call equals, $(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false), \

make/hotspot/lib/JvmMapfile.gmk

@@ -114,7 +114,7 @@ endif
 $(JVM_OUTPUTDIR)/symbols-objects: $(BUILD_LIBJVM_ALL_OBJS)
  $(call LogInfo, Generating symbol list from object files)
  $(CD) $(JVM_OUTPUTDIR)/objs && \
- $(DUMP_SYMBOLS_CMD) | $(NAWK) $(FILTER_SYMBOLS_AWK_SCRIPT) | $(SORT) -u > $@
+ $(DUMP_SYMBOLS_CMD) | $(AWK) $(FILTER_SYMBOLS_AWK_SCRIPT) | $(SORT) -u > $@
 
 SYMBOLS_SRC += $(JVM_OUTPUTDIR)/symbols-objects
 

make/modules/java.base/gensrc/GensrcExceptions.gmk

@@ -36,7 +36,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
  $(GENSRC_EXCEPTIONS_CMD)
  $(call LogInfo, Generating exceptions java.nio $*)
  $(call MakeDir, $(@D)/$*)
- SCRIPTS="$(TOPDIR)/make/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) \
+ SCRIPTS="$(TOPDIR)/make/scripts" AWK="$(AWK)" SH="$(SH)" $(SH) \
  $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_DEBUG)
  $(TOUCH) $@
 

make/modules/java.base/gensrc/GensrcMisc.gmk

@@ -78,10 +78,10 @@ endif
 define generate-preproc-src
  $(call MakeDir, $(@D))
  $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
- ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
+ ( $(AWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $(CPP_FILEPREFIX) $< \
  2> >($(GREP) -v '^$(<F)$$' >&2) \
- | $(NAWK) '/@@START_HERE@@/,0' \
+ | $(AWK) '/@@START_HERE@@/,0' \
  | $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
  -e 's/PREFIX_//' -e 's/^#.*//' \
  ) > $@ \

make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk

@@ -68,7 +68,7 @@ $(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
  ($(CD) $(GENSRC_DIR)/META-INF/providers && \
  p=""; \
  impl=""; \
- for i in $$($(NAWK) '$$0=FILENAME" "$$0' * | $(SORT) -k 2 | $(SED) 's/ .*//'); do \
+ for i in $$($(AWK) '$$0=FILENAME" "$$0' * | $(SORT) -k 2 | $(SED) 's/ .*//'); do \
  c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
  if test x$$p != x$$c; then \
  if test x$$p != x; then \

make/scripts/addNotices.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2020, 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
@@ -40,6 +40,6 @@ if [ "x$COPYRIGHT_YEARS" != x ]; then
 __END__
 fi
 
-$NAWK ' /^#.*Copyright.*Oracle/ { next }
+$AWK ' /^#.*Copyright.*Oracle/ { next }
  /^#([^!]|$)/ { sub(/^#/, " *"); print }
  /^$/ { print " */"; exit } ' $0

src/java.base/share/classes/java/lang/AbstractStringBuilder.java

@@ -157,8 +157,8 @@ int compareTo(AbstractStringBuilder another) {
  return 0;
  }
 
- byte val1[] = value;
- byte val2[] = another.value;
+ byte[] val1 = value;
+ byte[] val2 = another.value;
  int count1 = this.count;
  int count2 = another.count;
 
@@ -734,7 +734,7 @@ public AbstractStringBuilder append(char[] str) {
  * if {@code offset < 0} or {@code len < 0}
  * or {@code offset+len > str.length}
  */
- public AbstractStringBuilder append(char str[], int offset, int len) {
+ public AbstractStringBuilder append(char[] str, int offset, int len) {
  int end = offset + len;
  checkRange(offset, end, str.length);
  ensureCapacityInternal(count + len);
@@ -1238,9 +1238,6 @@ public AbstractStringBuilder insert(int dstOffset, CharSequence s) {
  if (s == null) {
  s = "null";
  }
- if (s instanceof String) {
- return this.insert(dstOffset, (String)s);
- }
  return this.insert(dstOffset, s, 0, s.length());
  }
 
@@ -1300,7 +1297,11 @@ public AbstractStringBuilder insert(int dstOffset, CharSequence s,
  ensureCapacityInternal(count + len);
  shift(dstOffset, len);
  count += len;
- putCharsAt(dstOffset, s, start, end);
+ if (s instanceof String) {
+ putStringAt(dstOffset, (String) s, start, end);
+ } else {
+ putCharsAt(dstOffset, s, start, end);
+ }
  return this;
  }
 
@@ -1558,9 +1559,8 @@ public int lastIndexOf(String str, int fromIndex) {
  public AbstractStringBuilder reverse() {
  byte[] val = this.value;
  int count = this.count;
- int coder = this.coder;
  int n = count - 1;
- if (COMPACT_STRINGS && coder == LATIN1) {
+ if (isLatin1()) {
  for (int j = (n-1) >> 1; j >= 0; j--) {
  int k = n - j;
  byte cj = val[j];
@@ -1648,7 +1648,7 @@ final byte[] getValue() {
  * @param dstBegin the char index, not offset of byte[]
  * @param coder the coder of dst[]
  */
- void getBytes(byte dst[], int dstBegin, byte coder) {
+ void getBytes(byte[] dst, int dstBegin, byte coder) {
  if (this.coder == coder) {
  System.arraycopy(value, 0, dst, dstBegin << coder, count << coder);
  } else { // this.coder == LATIN && coder == UTF16
@@ -1713,11 +1713,15 @@ private final void putCharsAt(int index, CharSequence s, int off, int end) {
  }
  }
 
- private final void putStringAt(int index, String str) {
+ private void putStringAt(int index, String str, int off, int end) {
  if (getCoder() != str.coder()) {
  inflate();
  }
- str.getBytes(value, index, coder);
+ str.getBytes(value, off, index, coder, end);
+ }
+
+ private void putStringAt(int index, String str) {
+ putStringAt(index, str, 0, str.length());
  }
 
  private final void appendChars(char[] s, int off, int end) {

src/java.base/share/classes/java/lang/String.java

@@ -3599,14 +3599,34 @@ public String repeat(int count) {
  * @param dstBegin the char index, not offset of byte[]
  * @param coder the coder of dst[]
  */
- void getBytes(byte dst[], int dstBegin, byte coder) {
+ void getBytes(byte[] dst, int dstBegin, byte coder) {
  if (coder() == coder) {
  System.arraycopy(value, 0, dst, dstBegin << coder, value.length);
  } else { // this.coder == LATIN && coder == UTF16
  StringLatin1.inflate(value, 0, dst, dstBegin, value.length);
  }
  }
 
+ /**
+ * Copy character bytes from this string into dst starting at dstBegin.
+ * This method doesn't perform any range checking.
+ *
+ * Invoker guarantees: dst is in UTF16 (inflate itself for asb), if two
+ * coders are different, and dst is big enough (range check)
+ *
+ * @param srcPos the char index, not offset of byte[]
+ * @param dstBegin the char index to start from
+ * @param coder the coder of dst[]
+ * @param length the amount of copied chars
+ */
+ void getBytes(byte[] dst, int srcPos, int dstBegin, byte coder, int length) {
+ if (coder() == coder) {
+ System.arraycopy(value, srcPos, dst, dstBegin << coder, length << coder());
+ } else { // this.coder == LATIN && coder == UTF16
+ StringLatin1.inflate(value, srcPos, dst, dstBegin, length);
+ }
+ }
+
  /*
  * Package private constructor. Trailing Void argument is there for
  * disambiguating it against other (public) constructors.